@matheusbsbs / matheus-bagliano / commits / 0230af7776

What's cooking (2011/04 #06)

Junio C Hamano committed Apr 25, 2011 at 15:45 UTC 0230af77762efdec53654855a106ae52c02a9cb2
1 file changed +240 -247
whats-cooking.txt
+240 -247
@@ -1,77 +1,91 @@
1 To: git@vger.kernel.org
2 -Subject: What's cooking in git.git (Apr 2011, #05; Tue, 19)
3 -X-master-at: 6ceb270ce6f65cf4bc2a22830f96e0cc838b3fec
4 -X-next-at: 63e4ee5f87eede11d1377370c385c26c5b90c6e7
2 +Subject: What's cooking in git.git (Apr 2011, #06; Mon, 25)
3 +X-master-at: ec014eac0e9e6f30cbbca616090fa2ecf74797e7
4 +X-next-at: 4216d33f893e8855ed345bfc97625e82433e569c
5
6 -What's cooking in git.git (Apr 2011, #05; Tue, 19)
6 +What's cooking in git.git (Apr 2011, #06; Mon, 25)
7 --------------------------------------------------
8
9 Here are the topics that have been cooking. Commits prefixed with '-' are
10 only in 'pu' while commits prefixed with '+' are in 'next'.
11
12 -As we are already in pre-release feature freeze, some of the trivially
13 -correct features and fixes to non-regression bugs are only queued to
14 -'next' but not in 'master'. They are marked as post 1.7.5 candidates in
15 -this list.
12 +The main part of this cycle is expected to run thru May, aiming for a
13 +feature freeze in early June. We are at the beginning of week #1 of this
14 +cycle and week #2 starts on May 2nd.
15
16 --------------------------------------------------
17 [New Topics]
18
20 -* cn/log-parse-opt (2011-04-14) 1 commit
21 - - log: convert to parse-options
19 +* jn/setup-revisions-glob-and-friends-passthru (2011-04-21) 2 commits
20 + - revisions: allow --glob and friends in parse_options-enabled commands
21 + - revisions: split out handle_revision_pseudo_opt function
22
23 -* rr/rerere-clear-libify (2011-04-13) 1 commit
24 - - rerere: Expose an API corresponding to 'clear' functionality
23 +* mg/x-years-12-months (2011-04-20) 1 commit
24 + (merged to 'next' on 2011-04-25 at 74ba83b)
25 + + date: avoid "X years, 12 months" in relative dates
26
26 -Jonathan had good comments on moving the garbage collection interface as
27 -well. Perhaps needs a re-roll.
27 +Will merge to "master" by the end of week #1.
28
29 -* jk/format-patch-multiline-header (2011-04-14) 1 commit
30 - - format-patch: wrap email addresses after long names
29 +* jc/fix-add-u-unmerged (2011-04-20) 1 commit
30 + - Fix "add -u" that sometimes fails to resolve unmerged paths
31 + (this branch uses jc/fix-diff-files-unmerged.)
32
32 -* jn/format-patch-doc (2011-04-18) 6 commits
33 - - Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
34 - - Documentation: publicize hints for sending patches with GMail
35 - - Documentation: publicize KMail hints for sending patches inline
36 - - Documentation: hints for sending patches inline with Thunderbird
37 - - Documentation: explain how to check for patch corruption
38 - - Merge v1.7.5-rc2 into jn/format-patch-doc
39 - (this branch uses jn/maint-format-patch-doc.)
33 +* jc/fix-diff-files-unmerged (2011-04-22) 4 commits
34 + - diff-files: show unmerged entries correctly
35 + - diff: remove often unused parameters from diff_unmerge()
36 + - diff.c: return filepair from diff_unmerge()
37 + - test: use $_z40 from test-lib
38 + (this branch is used by jc/fix-add-u-unmerged.)
39
41 -* jn/gitweb-js (2011-04-15) 13 commits
42 - - gitweb: Make JavaScript ability to adjust timezones configurable
43 - - gitweb.js: Add UI for selecting common timezone to display dates
44 - - gitweb: JavaScript ability to adjust time based on timezone
45 - - gitweb: Unify the way long timestamp is displayed
46 - - gitweb: Refactor generating of long dates into format_timestamp_html
47 - - gitweb.js: Provide getElementsByClassName method (if it not exists)
48 - - gitweb.js: Introduce gitweb/static/js/lib/cookies.js
49 - - gitweb.js: Extract and improve datetime handling
50 - - gitweb.js: Provide default values for padding in padLeftStr and padLeft
51 - - gitweb.js: Update and improve comments in JavaScript files
52 - - gitweb: Split JavaScript for maintability, combining on build
53 - - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
54 - - git-instaweb: Simplify build dependency on gitweb
40 +* js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
41 + - send-pack: avoid deadlock when pack-object dies early
42 + (this branch is used by js/maint-send-pack-stateless-rpc-deadlock-fix.)
43
56 -* jn/maint-format-patch-doc (2011-04-14) 1 commit
57 - - Documentation: describe the format of messages with inline patches
58 - (this branch is used by jn/format-patch-doc.)
44 +* js/maint-send-pack-stateless-rpc-deadlock-fix (2011-04-25) 1 commit
45 + - Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
46 + (this branch uses js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix.)
47
60 -* jn/run-command-error-failure (2011-04-19) 1 commit
61 - - run-command: write full error message in die_child
48 +* vh/git-svn-doc (2011-04-25) 1 commit
49 + - git-svn.txt: fix usage of --add-author-from
50
63 -* ss/cherry-pick-x-doc (2011-04-15) 1 commit
64 - - doc: Clarify that "cherry-pick -x" does not use "git notes"
51 +--------------------------------------------------
52 +[Stalled]
53
66 -* ss/doc-svn (2011-04-19) 1 commit
67 - - remove noise and inaccuracies from git-svn docs
54 +* jk/maint-merge-rename-create (2011-03-25) 3 commits
55 + - merge: turn on rewrite detection
56 + - merge: handle renames with replacement content
57 + - t3030: fix accidental success in symlink rename
58
69 -* vr/merge-base-doc (2011-04-15) 2 commits
70 - - Restructure documentation for git-merge-base.
71 - - Documentation: update to git-merge-base --octopus
59 +Peff wanted to reroll this, so this is taken out of "next".
60
73 ---------------------------------------------------
74 -[Stalled]
61 +* dm/http-cleanup (2011-03-30) 2 commits
62 + - http-push: refactor curl_easy_setup madness
63 + - http: make curl callbacks match contracts from curl header
64 +
65 +I didn't see anything glaringly wrong with this, but I would appreciate
66 +extra sets of eyeballs from people who have worked on HTTP transports to
67 +double check.
68 +
69 +* jk/maint-push-async-hang (2011-03-31) 4 commits
70 + - send-pack: abort sideband demuxer on pack-objects error
71 + - run-command: allow aborting async code prematurely
72 + - finish_async: be quiet when waiting for async process
73 + - teach wait_or_whine a "quiet" mode
74 + (this branch is used by jk/maint-push-async-hang-threads.)
75 +
76 +* jk/maint-push-async-hang-threads (2011-03-31) 2 commits
77 + - run-command: implement abort_async for pthreads
78 + - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
79 + (this branch uses jk/maint-push-async-hang.)
80 +
81 +These two series aim for a good goal, but needs reroll after 1.7.5 with
82 +sign-offs.
83 +
84 +* rr/rerere-clear-libify (2011-04-13) 1 commit
85 + - rerere: Expose an API corresponding to 'clear' functionality
86 +
87 +Jonathan had good comments on moving the garbage collection interface as
88 +well. Perhaps needs a re-roll.
89
90 * jc/maint-add-p-overlapping-hunks (2011-04-06) 2 commits
91 - "add -p": work-around an old laziness that does not coalesce hunks
@@ -84,7 +98,8 @@ we may want to add tests before moving it forward.
98 - builtin/show: do not prune by pathspec
99 (this branch uses mg/reflog-with-options.)
100
87 -I wanted to like this, but it still feels like too much magic.
101 +I wanted to like this, but it still feels like too much magic. Will drop
102 +and wait for the topic to resurface.
103
104 * gr/cvsimport-alternative-cvspass-location (2011-02-18) 1 commit
105 - Look for password in both CVS and CVSNT password files.
@@ -99,8 +114,8 @@ to regress the users of the original cvs.
114 - write_idx_file: introduce a struct to hold idx customization options
115 - index-pack: group the delta-base array entries also by type
116
102 -Still a WIP, and will not be ready for 1.7.5. Need to put histogram output
103 -into index-pack --verify to really kill verify-pack.
117 +Still a WIP. Need to put histogram output into index-pack --verify to
118 +really kill verify-pack.
119
120 * jk/tag-contains (2010-07-05) 4 commits
121 - Why is "git tag --contains" so slow?
@@ -116,234 +131,245 @@ current usage context.
131 --------------------------------------------------
132 [Cooking]
133
134 +* cn/log-parse-opt (2011-04-14) 1 commit
135 + - log: convert to parse-options
136 +
137 +* jk/format-patch-multiline-header (2011-04-14) 1 commit
138 + - format-patch: wrap email addresses after long names
139 +
140 +Will merge to "next".
141 +
142 +* jn/maint-format-patch-doc (2011-04-14) 1 commit
143 + - Documentation: describe the format of messages with inline patches
144 + (this branch is used by jn/format-patch-doc.)
145 +
146 +Will merge to "next".
147 +
148 +* jn/format-patch-doc (2011-04-18) 6 commits
149 + - Documentation/format-patch: suggest Toggle Word Wrap add-on for Thunderbird
150 + - Documentation: publicize hints for sending patches with GMail
151 + - Documentation: publicize KMail hints for sending patches inline
152 + - Documentation: hints for sending patches inline with Thunderbird
153 + - Documentation: explain how to check for patch corruption
154 + - Merge v1.7.5-rc2 into jn/format-patch-doc
155 + (this branch uses jn/maint-format-patch-doc.)
156 +
157 +Will merge to "next".
158 +
159 +* jn/gitweb-js (2011-04-15) 13 commits
160 + - gitweb: Make JavaScript ability to adjust timezones configurable
161 + - gitweb.js: Add UI for selecting common timezone to display dates
162 + - gitweb: JavaScript ability to adjust time based on timezone
163 + - gitweb: Unify the way long timestamp is displayed
164 + - gitweb: Refactor generating of long dates into format_timestamp_html
165 + - gitweb.js: Provide getElementsByClassName method (if it not exists)
166 + - gitweb.js: Introduce gitweb/static/js/lib/cookies.js
167 + - gitweb.js: Extract and improve datetime handling
168 + - gitweb.js: Provide default values for padding in padLeftStr and padLeft
169 + - gitweb.js: Update and improve comments in JavaScript files
170 + - gitweb: Split JavaScript for maintability, combining on build
171 + - Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
172 + - git-instaweb: Simplify build dependency on gitweb
173 +
174 +* jn/run-command-error-failure (2011-04-20) 2 commits
175 + - run-command: handle short writes and EINTR in die_child
176 + - tests: check error message from run_command
177 +
178 +Will merge to "next".
179 +
180 +* ss/cherry-pick-x-doc (2011-04-15) 1 commit
181 + - doc: Clarify that "cherry-pick -x" does not use "git notes"
182 +
183 +Will merge to "next".
184 +
185 +* ss/doc-svn (2011-04-19) 1 commit
186 + - remove noise and inaccuracies from git-svn docs
187 +
188 +Will merge to "next".
189 +
190 +* vr/merge-base-doc (2011-04-15) 2 commits
191 + - Restructure documentation for git-merge-base.
192 + - Documentation: update to git-merge-base --octopus
193 +
194 +Will merge to "next".
195 +
196 * ef/maint-strbuf-init (2011-04-10) 2 commits
120 - (merged to 'next' on 2011-04-11 at 1dd34d9)
197 + (merged to 'next' on 2011-04-25 at 6a45422)
198 + config: support values longer than 1023 bytes
199 + strbuf: make sure buffer is zero-terminated
200
124 -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
125 -release.
201 +Will merge to "master" by the end of week #1.
202
203 * jh/dirstat (2011-04-12) 4 commits
128 - (merged to 'next' on 2011-04-12 at dd2c308)
204 + (merged to 'next' on 2011-04-25 at cb277e6)
205 + --dirstat: In case of renames, use target filename instead of source filename
130 - (merged to 'next' on 2011-04-11 at 33d0417)
206 + Teach --dirstat not to completely ignore rearranged lines within a file
207 + --dirstat-by-file: Make it faster and more correct
208 + --dirstat: Describe non-obvious differences relative to --stat or regular diff
209
135 -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
136 -releases.
210 +Will merge to "master" by the end of week #1.
211
212 * jm/mergetool-submodules (2011-04-13) 1 commit
213 - mergetool: Teach about submodules
214
141 -Looked sane if inefficient when both branches have the submodule but was
142 -dubious in delete/modify conflict case. Awaiting response and possibly a
143 -reroll.
215 +Will merge to "next".
216
217 * rj/sparse (2011-04-07) 7 commits
146 - - sparse: Fix some "symbol not declared" warnings
147 - - sparse: Fix errors due to missing target-specific variables
148 - - sparse: Fix an "symbol 'merge_file' not decared" warning
149 - - sparse: Fix an "symbol 'format_subject' not declared" warning
150 - - sparse: Fix some "Using plain integer as NULL pointer" warnings
151 - - sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
152 - - Makefile: Use cgcc rather than sparse in the check target
218 + (merged to 'next' on 2011-04-25 at e1af2af)
219 + + sparse: Fix some "symbol not declared" warnings
220 + + sparse: Fix errors due to missing target-specific variables
221 + + sparse: Fix an "symbol 'merge_file' not decared" warning
222 + + sparse: Fix an "symbol 'format_subject' not declared" warning
223 + + sparse: Fix some "Using plain integer as NULL pointer" warnings
224 + + sparse: Fix an "symbol 'cmd_index_pack' not declared" warning
225 + + Makefile: Use cgcc rather than sparse in the check target
226
154 -* ab/i18n-fixup (2011-04-14) 24 commits
155 - - i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
156 - - i18n: use test_i18n{grep,cmp} in t7508
157 - - i18n: use test_i18ngrep in t7506
158 - - i18n: use test_i18ngrep and test_i18ncmp in t7502
159 - - i18n: use test_i18ngrep in t7501
160 - - i18n: use test_i18ncmp in t7500
161 - - i18n: use test_i18ngrep in t7201
162 - - i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
163 - - i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
164 - - i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
165 - - i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
166 - - i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
167 - - i18n: use test_i18ngrep in lib-httpd and t2019
168 - - i18n: do not overuse C_LOCALE_OUTPUT (grep)
169 - - i18n: use test_i18ncmp in t1200 and t2200
170 - - i18n: .git file is not a human readable message (t5601)
171 - (merged to 'next' on 2011-04-12 at a94aa85)
172 - + i18n: do not overuse C_LOCALE_OUTPUT
173 - + i18n: mark init-db messages for translation
174 - + i18n: mark checkout plural warning for translation
175 - + i18n: mark checkout --detach messages for translation
176 - + i18n: mark clone nonexistent repository message for translation
177 - + i18n: mark merge CHERRY_PICK_HEAD messages for translation
178 - + i18n: mark merge "upstream" messages for translation
179 - + i18n: mark merge "Could not read from" message for translation
180 -
181 -Fix-up patches queued near the tip avoid excessive use of C_LOCALE_OUTPUT
182 -to skip the entire tests. They skip only the parts that need to be skipped
183 -without changing the sequence of commands that are run under GETTEXT_POISON
184 -mode, which should be a big gain.
227 +Will merge to "master" by the end of week #1.
228
229 * cn/format-patch-quiet (2011-04-12) 2 commits
187 - (merged to 'next' on 2011-04-12 at 915a915)
230 + (merged to 'next' on 2011-04-25 at 40e2d1c)
231 + format-patch: document --quiet option
232 + format-patch: don't pass on the --quiet flag
233
191 -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
192 -release.
234 +Will merge to "master" by the end of week #1.
235
236 * dm/stash-k-i-p (2011-04-07) 2 commits
195 - (merged to 'next' on 2011-04-11 at 8349531)
237 + (merged to 'next' on 2011-04-25 at 01a207c)
238 + stash: ensure --no-keep-index and --patch can be used in any order
239 + stash: add two more tests for --no-keep-index
240
199 -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
200 -releases.
201 -
202 -* jc/magic-pathspec (2011-04-06) 3 commits
203 - (merged to 'next' on 2011-04-08 at c5247ce)
204 - + magic pathspec: add ":(icase)path" to match case insensitively
205 - + magic pathspec: futureproof shorthand form
206 - + magic pathspec: add tentative ":/path/from/top/level" pathspec support
207 - (this branch is tangled with jc/add-u-migration-2.)
208 -
209 -Thanks to Peff, Duy, and Michael for helping to whip the syntax and
210 -the basic semantics into a not-so-horrible shape. Will not merge until
211 -the 1.7.5 ships, though.
241 +Will merge to "master" by the end of week #1.
242
243 * jc/merge-dash-previous (2011-04-07) 1 commit
214 - (merged to 'next' on 2011-04-11 at 06480d1)
244 + (merged to 'next' on 2011-04-25 at 512faf4)
245 + merge: allow "-" as a short-hand for "previous branch"
246
217 -Should graduate soon after 1.7.5 ships.
247 +Will merge to "master" by the end of week #1.
248
249 * rr/doc-content-type (2011-04-07) 4 commits
220 - (merged to 'next' on 2011-04-11 at dca8914)
250 + (merged to 'next' on 2011-04-25 at 83c41e4)
251 + Documentation: Allow custom diff tools to be specified in 'diff.tool'
252 + Documentation: Add diff.<driver>.* to config
253 + Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
254 + Documentation: Add filter.<driver>.* to config
255
226 -Is everybody happy with the new wording?
227 -
228 -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
229 -releases.
230 -
231 -* dm/http-cleanup (2011-03-30) 2 commits
232 - - http-push: refactor curl_easy_setup madness
233 - - http: make curl callbacks match contracts from curl header
234 -
235 -I didn't see anything glaringly wrong with this, but I would appreciate
236 -extra sets of eyeballs from people who have worked on HTTP transports to
237 -double check.
256 +Will merge to "master" by the end of week #1.
257
258 * jc/pack-objects-bigfile (2011-04-05) 1 commit
240 - (merged to 'next' on 2011-04-11 at 86c52b1)
259 + (merged to 'next' on 2011-04-25 at 621035c)
260 + Teach core.bigfilethreashold to pack-objects
261
243 -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
244 -releases.
262 +Will merge to "master" by the end of week #1.
263
264 * jk/maint-stash-oob (2011-04-06) 2 commits
247 - (merged to 'next' on 2011-04-11 at d882935)
265 + (merged to 'next' on 2011-04-25 at 8478a92)
266 + stash: fix false positive in the invalid ref test.
267 + stash: fix accidental apply of non-existent stashes
268
251 -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
252 -releases.
269 +Will merge to "master" by the end of week #1.
270
271 * nk/blame-abbrev (2011-04-06) 1 commit
255 - (merged to 'next' on 2011-04-11 at 19e8676)
272 + (merged to 'next' on 2011-04-25 at 59a4281)
273 + blame: add --abbrev command line option and make it honor core.abbrev
274
258 -Should graduate soon after 1.7.5 ships.
259 -
260 -* nm/submodule-update-force (2011-04-01) 1 commit
261 - (merged to 'next' on 2011-04-11 at d94f6f3)
262 - + submodule: Add --force option for git submodule update
263 -
264 -Are submodule users happy with this change?
265 -
266 -Should graduate soon after 1.7.5 ships.
275 +Will merge to "master" by the end of week #1.
276
277 * jk/maint-upload-pack-shallow (2011-04-06) 1 commit
269 - (merged to 'next' on 2011-04-11 at 9104545)
278 + (merged to 'next' on 2011-04-25 at 073dac4)
279 + upload-pack: start pack-objects before async rev-list
280
272 -A sensible and low-impact fix. Should graduate soon after 1.7.5 ships
273 -and merged to 1.7.4.X and 1.7.5.1 releases.
281 +Will merge to "master" by the end of week #1.
282
283 * jk/stash-loosen-safety (2011-04-05) 1 commit
276 - (merged to 'next' on 2011-04-11 at b59c533)
284 + (merged to 'next' on 2011-04-25 at cdc549f)
285 + stash: drop dirty worktree check on apply
286
279 -Should graduate soon after 1.7.5 ships.
287 +Will merge to "master" by the end of week #1.
288
289 * dm/color-palette (2011-04-05) 1 commit
282 - (merged to 'next' on 2011-04-04 at 0244ef9)
290 + (merged to 'next' on 2011-04-25 at 839b17b)
291 + Share color list between graph and show-branch
292
285 -Should graduate soon after 1.7.5 ships.
293 +Will merge to "master" by the end of week #1.
294
295 * mg/sha1-path-advise (2011-03-31) 2 commits
288 - (merged to 'next' on 2011-04-04 at e429e0c)
296 + (merged to 'next' on 2011-04-25 at 8b094f5)
297 + sha1_name: Suggest commit:./file for path in subdir
298 + t1506: factor out test for "Did you mean..."
299
292 -Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release.
300 +Will merge to "master" by the end of week #1.
301
302 * ar/clean-rmdir-empty (2011-04-01) 1 commit
295 - (merged to 'next' on 2011-04-03 at c63fac8)
303 + (merged to 'next' on 2011-04-25 at 5a71fdb)
304 + clean: unreadable directory may still be rmdir-able if it is empty
305
298 -Should graduate soon after 1.7.5 ships and merged to 1.7.4.X and 1.7.5.1
299 -releases.
300 -
301 -* jk/maint-push-async-hang (2011-03-31) 4 commits
302 - - send-pack: abort sideband demuxer on pack-objects error
303 - - run-command: allow aborting async code prematurely
304 - - finish_async: be quiet when waiting for async process
305 - - teach wait_or_whine a "quiet" mode
306 - (this branch is used by jk/maint-push-async-hang-threads.)
307 -
308 -* jk/maint-push-async-hang-threads (2011-03-31) 2 commits
309 - - run-command: implement abort_async for pthreads
310 - - Merge branch 'jk/maint-push-async-hang' into jk/maint-push-async-hang-threads
311 - (this branch uses jk/maint-push-async-hang.)
312 -
313 -These two series aim for a good goal, but needs reroll after 1.7.5 with
314 -sign-offs.
306 +Will merge to "master" by the end of week #1.
307
308 * mg/reflog-with-options (2011-04-01) 3 commits
317 - (merged to 'next' on 2011-04-03 at e69a95c)
309 + (merged to 'next' on 2011-04-25 at 1ab8b78)
310 + reflog: fix overriding of command line options
311 + t/t1411: test reflog with formats
312 + builtin/log.c: separate default and setup of cmd_log_init()
313 (this branch is used by mg/show-without-prune.)
314
323 -Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release.
315 +Will merge to "master" by the end of week #1.
316
317 * mh/git-svn-automkdirs (2011-04-01) 1 commit
326 - (merged to 'next' on 2011-04-03 at 7fa4978)
318 + (merged to 'next' on 2011-04-25 at 2e95357)
319 + git-svn: add an option to skip the creation of empty directories
320
329 -Should be safe, but I'd like an Ack from git-svn folks.
321 +Will merge to "master" by the end of week #1.
322 +
323 +* ab/i18n-fixup (2011-04-14) 24 commits
324 + (merged to 'next' on 2011-04-25 at 32fef07)
325 + + i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
326 + + i18n: use test_i18n{grep,cmp} in t7508
327 + + i18n: use test_i18ngrep in t7506
328 + + i18n: use test_i18ngrep and test_i18ncmp in t7502
329 + + i18n: use test_i18ngrep in t7501
330 + + i18n: use test_i18ncmp in t7500
331 + + i18n: use test_i18ngrep in t7201
332 + + i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
333 + + i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
334 + + i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
335 + + i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
336 + + i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
337 + + i18n: use test_i18ngrep in lib-httpd and t2019
338 + + i18n: do not overuse C_LOCALE_OUTPUT (grep)
339 + + i18n: use test_i18ncmp in t1200 and t2200
340 + + i18n: .git file is not a human readable message (t5601)
341 + + i18n: do not overuse C_LOCALE_OUTPUT
342 + + i18n: mark init-db messages for translation
343 + + i18n: mark checkout plural warning for translation
344 + + i18n: mark checkout --detach messages for translation
345 + + i18n: mark clone nonexistent repository message for translation
346 + + i18n: mark merge CHERRY_PICK_HEAD messages for translation
347 + + i18n: mark merge "upstream" messages for translation
348 + + i18n: mark merge "Could not read from" message for translation
349 +
350 +Will merge to "master" by the end of week #2.
351 +
352 +* nm/submodule-update-force (2011-04-01) 1 commit
353 + (merged to 'next' on 2011-04-25 at 270fffc)
354 + + submodule: Add --force option for git submodule update
355 +
356 +Will merge to "master" by the end of week #2.
357
358 * jc/diff-irreversible-delete (2011-02-28) 1 commit
332 - (merged to 'next' on 2011-04-03 at 5a23b23)
359 + (merged to 'next' on 2011-04-25 at c37610d)
360 + git diff -D: omit the preimage of deletes
361
335 -Should graduate soon after 1.7.5 ships.
362 +Will merge to "master" by the end of week #2.
363
364 * jh/notes-add-ui (2011-03-30) 1 commit
338 - (merged to 'next' on 2011-04-11 at 72e7c39)
365 + (merged to 'next' on 2011-04-25 at 4fb1ac2)
366 + Make "git notes add" more user-friendly when there are existing notes
367
341 -Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release.
368 +Will merge to "master" by the end of week #2.
369
370 * jk/notes-ui-updates (2011-04-14) 8 commits
344 - (merged to 'next' on 2011-04-14 at b9f1b13)
371 + (merged to 'next' on 2011-04-25 at 4216d33)
372 + contrib/completion: --notes, --no-notes
346 - (merged to 'next' on 2011-04-11 at 313d6c4)
373 + log/pretty-options: Document --[no-]notes and deprecate old notes options
374 + revision.c: make --no-notes reset --notes list
375 + revision.c: support --notes command-line option
@@ -352,24 +378,19 @@ Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release.
378 + revision.c: refactor notes ref expansion
379 + notes: make expand_notes_ref globally accessible
380
355 -Should graduate soon after 1.7.5 ships.
381 +Will merge to "master" by the end of week #2.
382
383 * nd/maint-setup (2011-03-26) 2 commits
358 - (merged to 'next' on 2011-03-31 at 2c36f6a)
384 + (merged to 'next' on 2011-04-25 at fd45c63)
385 + Kill off get_relative_cwd()
386 + setup: return correct prefix if worktree is '/'
387
362 -This benefits only the minority who use /.git at the root level of the
363 -filesystem, but the changed code is used from many codepaths.
364 -
365 -Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release.
388 +Will merge to "master" by the end of week #2.
389
390 * mz/rebase (2011-02-28) 34 commits
368 - (merged to 'next' on 2011-03-31 at 3b1343c)
391 + (merged to 'next' on 2011-04-25 at 4bbed46)
392 + rebase: define options in OPTIONS_SPEC
370 - (merged to 'next' on 2011-02-25 at 52caa7a)
393 + Makefile: do not install sourced rebase scripts
372 - (merged to 'next' on 2011-02-22 at 3219155)
394 + rebase: use @{upstream} if no upstream specified
395 + rebase -i: remove unnecessary state rebase-root
396 + rebase -i: don't read unused variable preserve_merges
@@ -403,86 +424,58 @@ Should graduate soon after 1.7.5 ships and merged to 1.7.5.1 release.
424 + rebase: refactor reading of state
425 + rebase: clearer names for directory variables
426
406 -I wanted to wait for an independent Ack or two for the tip one, which was
407 -a response to regression concerns raised by J6t, but ended up merging it
408 -to 'next' after giving another look. Will not merge before 1.7.5, as
409 -there is no user visible improvements up to this point.
410 -
411 -* jk/maint-merge-rename-create (2011-03-25) 3 commits
412 - (merged to 'next' on 2011-03-31 at b9bc9f1)
413 - + merge: turn on rewrite detection
414 - + merge: handle renames with replacement content
415 - + t3030: fix accidental success in symlink rename
416 -
417 -Peff wanted to reroll this.
427 +Will merge to "master" by the end of week #2.
428
429 * mz/maint-rename-unmerged (2011-03-23) 1 commit
420 - (merged to 'next' on 2011-03-31 at c7b3d9a)
430 + (merged to 'next' on 2011-04-25 at 038a8c3)
431 + diffcore-rename: don't consider unmerged path as source
432
423 -Will cook until 1.7.5 final.
433 +Will merge to "master" by the end of week #2.
434
435 * nd/struct-pathspec (2011-04-05) 5 commits
426 - (merged to 'next' on 2011-04-11 at ee794a5)
436 + (merged to 'next' on 2011-04-25 at 65dbe80)
437 + pathspec: rename per-item field has_wildcard to use_wildcard
428 - (merged to 'next' on 2011-03-31 at 66cbb7d)
438 + Improve tree_entry_interesting() handling code
439 + Convert read_tree{,_recursive} to support struct pathspec
440 + Reimplement read_tree_recursive() using tree_entry_interesting()
441 + Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
442
434 -Will cook until 1.7.5 final.
443 +Will merge to "master" by the end of week #2.
444 +
445 +* jc/magic-pathspec (2011-04-06) 3 commits
446 + (merged to 'next' on 2011-04-25 at 788cd46)
447 + + magic pathspec: add ":(icase)path" to match case insensitively
448 + + magic pathspec: futureproof shorthand form
449 + + magic pathspec: add tentative ":/path/from/top/level" pathspec support
450 +
451 +Thanks to Peff, Duy, and Michael for helping to whip the syntax and the
452 +basic semantics into a not-so-horrible shape.
453 +
454 +Will merge to "master" by the end of week #2.
455
456 * jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
437 - (merged to 'next' on 2011-03-31 at 8d685d7)
457 + (merged to 'next' on 2011-04-25 at 25c195e)
458 + diffcore-rename: fall back to -C when -C -C busts the rename limit
459 + diffcore-rename: record filepair for rename src
460 + diffcore-rename: refactor "too many candidates" logic
461 + builtin/diff.c: remove duplicated call to diff_result_code()
462
443 -Should graduate soon after 1.7.5 ships.
444 -
445 -* cn/system-path-tweak (2011-03-17) 1 commit
446 - - system_path: use a static buffer
447 -
448 -Don't see much point in this itself. Probably will drop.
463 +Will merge to "master" by the end of week #2.
464
465 * en/merge-recursive (2011-03-17) 4 commits
451 - (merged to 'next' on 2011-03-18 at a32016b)
466 + (merged to 'next' on 2011-04-25 at 8027acd)
467 + merge-recursive: tweak magic band-aid
453 - (merged to 'next' on 2011-03-09 at 3762932)
468 + merge-recursive: When we detect we can skip an update, actually skip it
469 + t6022: New test checking for unnecessary updates of files in D/F conflicts
470 + t6022: New test checking for unnecessary updates of renamed+modified files
471
458 -I am not happy with these magic band aids. Will hold.
472 +Will merge to "master" by the end of week #2.
473
474 --------------------------------------------------
475 [Discarded]
476
463 -* jc/add-u-migration (2011-03-22) 3 commits
464 - . add: make "add -u/-A" update full tree without pathspec (step 3)
465 - . add: make "add -u/-A" update full tree without pathspec (step 2)
466 - (merged to 'next' on 2011-03-31 at 962e058)
467 - + add: make "add -u/-A" update full tree without pathspec
468 - (this branch is tangled with jc/add-u-migration-2.)
469 -
470 -* jc/add-u-migration-2 (2011-04-08) 5 commits
471 - (merged to 'next' on 2011-04-08 at 524e365)
472 - + Revert "add -u" default change plans
473 - (merged to 'next' on 2011-04-06 at 4a6bb82)
474 - + add -u: get rid of "treewideupdate" configuration
475 - + Merge branch 'jc/magic-pathspec' into early parts of jc/add-u-migration
476 - + magic pathspec: add tentative ":/path/from/top/level" pathspec support
477 - (merged to 'next' on 2011-03-31 at 962e058)
478 - + add: make "add -u/-A" update full tree without pathspec
479 - (this branch is tangled with jc/add-u-migration and jc/magic-pathspec.)
480 -
481 -These attempt "add -u" migration plans (two versions), but then revert
482 -both of them at the end where they are merged to 'next'.
477 +* cn/system-path-tweak (2011-03-17) 1 commit
478 + . system_path: use a static buffer
479
480 * jh/gitweb-localtime (2011-03-23) 1 commit
481 . gitweb: javascript ability to adjust time based on timezone
486 -
487 -
488 -