What's cooking (2010/10 #02)
Junio C Hamano committed
Oct 26, 2010 at 23:02 UTC
cf9d61f6e1147d846c456ca22b8499ade46a5417
1 file changed
+223
-195
whats-cooking.txt
+223
-195
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2010, #01; Wed, 13)
3
-X-master-at: 38a18873b21f6f2eebedc65aff2249fd6ec2168c
4
-X-next-at: 53ea256ab9071d54b4f09772408e442ad43bc73a
2
+Subject: What's cooking in git.git (Oct 2010, #02; Tue, 26)
3
+X-master-at: 7ebee44167fc25b975f5543472c851ab1840af1b
4
+X-next-at: 2d0e57103f0af55abbbd7c61b29650463c3887cc
5
6
-What's cooking in git.git (Oct 2010, #01; Wed, 13)
6
+What's cooking in git.git (Oct 2010, #02; Tue, 26)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,41 +11,95 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
11
marked with '.' do not appear in any of the integration branches, but I am
12
still holding onto them.
13
14
+Many topics have been cooking for a while in 'next', some of them for too
15
+long. Tonight's pushout is fairly large, and the result makes the set of
16
+remaining topics on 'next' very thin. A few people sent series based on
17
+'next'; that was not a pleasant experience for me to try separating them
18
+out, but I am in no position to complain---all of the topics that have
19
+been cooking for a very long time are long overdue.
20
+
21
--------------------------------------------------
15
-[Graduated to "master"]
22
+[New Topics]
23
+
24
+* ao/send-email-irt (2010-10-19) 7 commits
25
+ - t9001: send-email interation with --in-reply-to and --chain-reply-to
26
+ - t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
27
+ - Clarify and extend the "git diff" format documentation
28
+ - git-show-ref.txt: clarify the pattern matching
29
+ - documentation: git-config minor cleanups
30
+ - Update test script annotate-tests.sh to handle missing/extra authors
31
+ - {cvs,svn}import: use the new 'git read-tree --empty'
32
+
33
+* aw/git-p4-deletion (2010-10-22) 1 commit
34
+ (merged to 'next' on 2010-10-26 at 5847c40)
35
+ + Fix handling of git-p4 on deleted files
36
+
37
+* bg/maint-gitweb-test-lib (2010-10-20) 1 commit
38
+ - t/gitweb-lib: Don't pass constant to decode_utf8
39
+
40
+* cm/diff-check-at-eol (2010-10-10) 1 commit
41
+ - diff --check: correct line numbers of new blank lines at EOF
42
+
43
+* fc/apply-p2-get-header-name (2010-10-21) 3 commits
44
+ - test: git-apply -p2 rename/chmod only
45
+ - fixup! Fix git-apply with
46
+ - Fix git-apply with -p greater than 1
47
17
-* ab/makefile-track-cc (2010-09-12) 1 commit
18
- (merged to 'next' on 2010-09-27 at 51daee0)
19
- + Makefile: add CC to TRACK_CFLAGS
48
+* jk/add-e-doc (2010-10-21) 1 commit
49
+ - docs: give more hints about how "add -e" works
50
21
-* bc/fix-cherry-pick-root (2010-09-27) 1 commit
22
- (merged to 'next' on 2010-09-27 at e27f4c9)
23
- + builtin/revert.c: don't dereference a NULL pointer
51
+* jk/diff-CBM (2010-10-21) 1 commit
52
+ - diff: report bogus input to -C/-M/-B
53
25
-* cw/gitweb-hilite-config (2010-09-21) 1 commit
26
- (merged to 'next' on 2010-09-27 at dd234ba)
27
- + Enable highlight executable path as a configuration option
54
+* jk/missing-config (2010-10-21) 1 commit
55
+ - config: treat non-existent config files as empty
56
29
-* jk/repack-reuse-object (2010-09-27) 2 commits
30
- (merged to 'next' on 2010-09-27 at 5719f72)
31
- + Documentation: pack.compression: explain how to recompress
32
- + repack: add -F flag to let user choose between --no-reuse-delta/object
57
+* jn/fast-import-fix (2010-10-20) 4 commits
58
+ - fast-import: do not clear notes in do_change_note_fanout()
59
+ - t9300 (fast-import): another test for the "replace root" feature
60
+ - fast-import: tighten M 040000 syntax
61
+ - fast-import: filemodify after M 040000 <tree> "" crashes
62
34
-* mg/reset-doc (2010-09-15) 6 commits
35
- (merged to 'next' on 2010-09-22 at 2a10b71)
36
- + git-reset.txt: make modes description more consistent
37
- + git-reset.txt: point to git-checkout
38
- + git-reset.txt: use "working tree" consistently
39
- + git-reset.txt: reset --soft is not a no-op
40
- + git-reset.txt: reset does not change files in target
41
- + git-reset.txt: clarify branch vs. branch head
63
+* jn/git-cmd-h-bypass-setup (2010-10-22) 7 commits
64
+ - update-index -h: show usage even with corrupt index
65
+ - merge -h: show usage even with corrupt index
66
+ - ls-files -h: show usage even with corrupt index
67
+ - gc -h: show usage even with broken configuration
68
+ - commit/status -h: show usage even with broken configuration
69
+ - checkout-index -h: show usage even in an invalid repository
70
+ - branch -h: show usage even in an invalid repository
71
+ (this branch uses en/and-cascade-tests.)
72
43
-* uk/fix-author-ident-sed-script (2010-09-23) 1 commit
44
- (merged to 'next' on 2010-09-27 at 5ad7d90)
45
- + get_author_ident_from_commit(): remove useless quoting
73
+* kb/blame-author-email (2010-10-15) 1 commit
74
+ - blame: Add option to show author email instead of name
75
+
76
+* kb/maint-diff-ws-check (2010-10-20) 2 commits
77
+ - diff: handle lines containing only whitespace and tabs better
78
+ - test-lib: extend test_decode_color to handle more color codes
79
+
80
+* mg/make-prove (2010-10-14) 1 commit
81
+ - test: allow running the tests under "prove"
82
+
83
+* np/diff-in-corrupt-repository (2010-10-22) 1 commit
84
+ - diff: don't presume empty file when corresponding object is missing
85
+
86
+* np/pack-broken-boundary (2010-10-22) 1 commit
87
+ - make pack-objects a bit more resilient to repo corruption
88
+
89
+* tr/maint-git-repack-tmpfile (2010-10-19) 1 commit
90
+ - repack: place temporary packs under .git/objects/pack/
91
+
92
+* tr/maint-merge-file-subdir (2010-10-17) 2 commits
93
+ - merge-file: correctly find files when called in subdir
94
+ - prefix_filename(): safely handle the case where pfx_len=0
95
96
--------------------------------------------------
48
-[New Topics]
97
+[Graduated to "master"]
98
+
99
+* ab/require-perl-5.8 (2010-09-24) 2 commits
100
+ (merged to 'next' on 2010-09-27 at 1fcdd3c)
101
+ + perl: use "use warnings" instead of -w
102
+ + perl: bump the required Perl version to 5.8 from 5.6.[21]
103
104
* ab/send-email-perl (2010-09-30) 16 commits
105
(merged to 'next' on 2010-09-30 at cf8e58e)
@@ -66,12 +120,134 @@ still holding onto them.
120
+ send-email: use lexical filehandles for $compose
121
+ send-email: use lexical filehandle for opendir
122
123
+* as/daemon-multi-listen (2010-08-30) 2 commits
124
+ (merged to 'next' on 2010-09-30 at 8083bf4)
125
+ + daemon: allow more than one host address given via --listen
126
+ + daemon: add helper function named_sock_setup
127
+
128
+* dm/mergetool-vimdiff (2010-09-27) 3 commits
129
+ (merged to 'next' on 2010-09-29 at c8e22ea)
130
+ + mergetool-lib: make the three-way diff the default for vim/gvim
131
+ (merged to 'next' on 2010-09-22 at 12f7559)
132
+ + mergetool-lib: add a three-way diff view for vim/gvim
133
+ + mergetool-lib: combine vimdiff and gvimdiff run blocks
134
+
135
+* en/tree-walk-optim (2010-08-26) 4 commits
136
+ (merged to 'next' on 2010-09-22 at 0601f1b)
137
+ + diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
138
+ + tree_entry_interesting(): Make return value more specific
139
+ + tree-walk: Correct bitrotted comment about tree_entry()
140
+ + Document pre-condition for tree_entry_interesting
141
+
142
+* jf/merge-ignore-ws (2010-08-26) 4 commits
143
+ (merged to 'next' on 2010-09-22 at 5161fb8)
144
+ + merge-recursive: options to ignore whitespace changes
145
+ + merge-recursive --patience
146
+ + ll-merge: replace flag argument with options struct
147
+ + merge-recursive: expose merge options for builtin merge
148
+ (this branch is used by kb/merge-recursive-rename-threshold.)
149
+
150
+Possibly one of the star features of the coming release.
151
+
152
+* jp/send-email-to-cmd (2010-09-24) 1 commit
153
+ (merged to 'next' on 2010-09-30 at 4284ddb)
154
+ + git-send-email.perl: Add --to-cmd
155
+
156
+* kb/merge-recursive-rename-threshold (2010-09-27) 2 commits
157
+ (merged to 'next' on 2010-09-30 at 4f33817)
158
+ + diff: add synonyms for -M, -C, -B
159
+ + merge-recursive: option to specify rename threshold
160
+ (this branch uses jf/merge-ignore-ws.)
161
+
162
+* kf/post-receive-sample-hook (2010-09-10) 1 commit
163
+ (merged to 'next' on 2010-09-22 at db674a3)
164
+ + post-receive-email: ensure sent messages are not empty
165
+
166
+I notice that it uses "PAGER= generate_email" where generate_email is a
167
+shell function, which may break in some implementations of POSIX /bin/sh.
168
+This is not a regression (the original also had the same issue), but
169
+somebody who cares enough might want to look into it.
170
+
171
+* mg/fix-build-remote-helpers (2010-09-17) 1 commit
172
+ (merged to 'next' on 2010-09-30 at 0583d5f)
173
+ + remote-helpers: build in platform independent directory
174
+
175
+* ml/completion-zsh (2010-09-06) 1 commit
176
+ (merged to 'next' on 2010-09-22 at d62d10e)
177
+ + completion: make compatible with zsh
178
+
179
+Reported as breaking people with "set -u".
180
+
181
+* po/sendemail (2010-09-06) 3 commits
182
+ (merged to 'next' on 2010-09-22 at 1105f62)
183
+ + New send-email option smtpserveroption.
184
+ + Remove @smtp_host_parts variable as not used.
185
+ + Minor indentation fix.
186
+
187
+* sb/send-email-use-to-from-input (2010-10-04) 2 commits
188
+ (merged to 'next' on 2010-10-06 at 5e9cb61)
189
+ + send-email: Don't leak To: headers between patches
190
+ (merged to 'next' on 2010-09-30 at 513b6f1)
191
+ + send-email: Use To: headers in patch files
192
+
193
+* sn/doc-opt-notation (2010-10-08) 6 commits
194
+ (merged to 'next' on 2010-10-13 at 53ea256)
195
+ + Fix {update,checkout}-index usage strings
196
+ + Put a space between `<' and argument in pack-objects usage string
197
+ + Remove stray quotes in --pretty and --format documentation
198
+ + Use parentheses and `...' where appropriate
199
+ + Fix odd markup in --diff-filter documentation
200
+ + Use angles for placeholders consistently
201
+
202
+--------------------------------------------------
203
+[Stalled]
204
+
205
+* yd/dir-rename (2010-10-15) 5 commits
206
+ . Allow hiding renames of individual files involved in a directory rename.
207
+ . Consider all parents of a file as candidates for bulk rename.
208
+ . Handle the simpler case of a subdir invalidating bulk move.
209
+ . Add testcases for the --detect-bulk-moves diffcore flag.
210
+ . Introduce bulk-move detection in diffcore.
211
+
212
+Need to replace this with a rerolled one posted recently.
213
+
214
+* nd/index-doc (2010-09-06) 1 commit
215
+ - doc: technical details about the index file format
216
+
217
+Half-written but it is a good start. I may need to give some help in
218
+describing more recent index extensions.
219
+
220
+* cb/ignored-paths-are-precious (2010-08-21) 1 commit
221
+ - checkout/merge: optionally fail operation when ignored files need to be overwritten
222
+
223
+This needs tests; also we know of longstanding bugs in related area that
224
+needs to be addressed---they do not have to be part of this series but
225
+their reproduction recipe would belong to the test script for this topic.
226
+
227
+It would hurt users to make the new feature on by default, especially the
228
+ones with subdirectories that come and go.
229
+
230
+* jk/tag-contains (2010-07-05) 4 commits
231
+ - Why is "git tag --contains" so slow?
232
+ - default core.clockskew variable to one day
233
+ - limit "contains" traversals based on commit timestamp
234
+ - tag: speed up --contains calculation
235
+
236
+The idea of the bottom one is probably Ok, except that the use of object
237
+flags needs to be rethought, or at least the helper needs to be moved to
238
+builtin/tag.c to make it clear that it should not be used outside the
239
+current usage context.
240
+
241
+--------------------------------------------------
242
+[Cooking]
243
+
244
* cb/diff-fname-optim (2010-09-26) 3 commits
245
- diff: avoid repeated scanning while looking for funcname
246
- do not search functions for patch ID
247
- add rebase patch id tests
248
74
-* en/merge-recursive (2010-09-20) 38 commits
249
+* en/merge-recursive (2010-10-21) 39 commits
250
+ - merge-recursive:make_room_for_directories - work around dumb compilers
251
- merge-recursive: Remove redundant path clearing for D/F conflicts
252
- merge-recursive: Make room for directories in D/F conflicts
253
- handle_delete_modify(): Check whether D/F conflicts are still present
@@ -136,7 +312,7 @@ still holding onto them.
312
- t7607: add leading-path tests
313
- t7607: use test-lib functions and check MERGE_HEAD
314
139
-* jh/notes-merge (2010-10-09) 21 commits
315
+* jh/notes-merge (2010-10-21) 21 commits
316
- Provide 'git notes get-ref' to easily retrieve current notes ref
317
- git notes merge: Add testcases for merging notes trees at different fanouts
318
- git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
@@ -159,21 +335,27 @@ still holding onto them.
335
- (trivial) notes.h: Minor documentation fixes to copy_notes()
336
- notes.c: Hexify SHA1 in die() message from init_notes()
337
162
-Breaks build with arithmetic on (void *).
163
-
338
* jk/maint-rev-list-nul (2010-10-07) 1 commit
339
- rev-list: handle %x00 NUL in user format
340
167
-* jk/push-progress (2010-10-14) 2 commits
341
+* jk/push-progress (2010-10-17) 8 commits
342
- push: pass --progress down to git-pack-objects
343
- t5523-push-upstream: test progress messages
170
-
171
-* jm/mailmap (2010-10-11) 1 commit
344
+ - t5523-push-upstream: add function to ensure fresh upstream repo
345
+ - test_terminal: ensure redirections work reliably
346
+ - test_terminal: catch use without TTY prerequisite
347
+ - test-lib: allow test code to check the list of declared prerequisites
348
+ - tests: test terminal output to both stdout and stderr
349
+ - tests: factor out terminal handling from t7006
350
+
351
+* jm/mailmap (2010-10-19) 3 commits
352
+ - t4203: do not let "git shortlog" DWIM based on tty
353
+ - t4203 (mailmap): stop hardcoding commit ids and dates
354
- mailmap: fix use of freed memory
355
356
The new test seems to make t4203 break intermittently.
357
176
-* jn/send-pack-error (2010-10-12) 1 commit
358
+* jn/send-pack-error (2010-10-16) 1 commit
359
- send-pack: avoid redundant "pack-objects died with strange error"
360
361
* kb/completion-checkout (2010-10-12) 1 commit
@@ -200,80 +382,6 @@ The new test seems to make t4203 break intermittently.
382
- bash: not all 'git bisect' subcommands make sense when not bisecting
383
- bash: offer refs for 'git bisect start'
384
203
-* sn/doc-opt-notation (2010-10-08) 6 commits
204
- (merged to 'next' on 2010-10-13 at 53ea256)
205
- + Fix {update,checkout}-index usage strings
206
- + Put a space between `<' and argument in pack-objects usage string
207
- + Remove stray quotes in --pretty and --format documentation
208
- + Use parentheses and `...' where appropriate
209
- + Fix odd markup in --diff-filter documentation
210
- + Use angles for placeholders consistently
211
-
212
-* yd/dir-rename (2010-10-10) 5 commits
213
- - diff --check: correct line numbers of new blank lines at EOF
214
- - Transfer special display of toplevel dir to display-time.
215
- - Only show bulkmoves in output.
216
- - Add testcases for the --detect-bulk-moves diffcore flag.
217
- - Introduce bulk-move detection in diffcore.
218
-
219
-This seems to break the build with decl-after-stmt.
220
-
221
---------------------------------------------------
222
-[Stalled]
223
-
224
-* nd/index-doc (2010-09-06) 1 commit
225
- - doc: technical details about the index file format
226
-
227
-Half-written but it is a good start. I may need to give some help in
228
-describing more recent index extensions.
229
-
230
-* by/line-log (2010-09-11) 18 commits
231
- . log -L: do not free parents lists we might need again
232
- . Document line history browser
233
- . Add tests for line history browser
234
- . Add --full-line-diff option
235
- . Add --graph prefix before line history output
236
- . Add parent rewriting to line history browser
237
- . Make graph_next_line external to other part of git
238
- . Make rewrite_parents public to other part of git
239
- . Hook line history into cmd_log, ensuring a topo-ordered walk
240
- . Print the line log
241
- . map/take range to the parent of commits
242
- . Add range clone functions
243
- . Export three functions from diff.c
244
- . Parse the -L options
245
- . Refactor parse_loc
246
- . Add the basic data structure for line level history
247
- . parse-options: add two helper functions
248
- . parse-options: enhance STOP_AT_NON_OPTION
249
-
250
-Temporarily ejected to give room to nd/struct-pathspec topic as this
251
-conflicts with it.
252
-
253
-* cb/ignored-paths-are-precious (2010-08-21) 1 commit
254
- - checkout/merge: optionally fail operation when ignored files need to be overwritten
255
-
256
-This needs tests; also we know of longstanding bugs in related area that
257
-needs to be addressed---they do not have to be part of this series but
258
-their reproduction recipe would belong to the test script for this topic.
259
-
260
-It would hurt users to make the new feature on by default, especially the
261
-ones with subdirectories that come and go.
262
-
263
-* jk/tag-contains (2010-07-05) 4 commits
264
- - Why is "git tag --contains" so slow?
265
- - default core.clockskew variable to one day
266
- - limit "contains" traversals based on commit timestamp
267
- - tag: speed up --contains calculation
268
-
269
-The idea of the bottom one is probably Ok, except that the use of object
270
-flags needs to be rethought, or at least the helper needs to be moved to
271
-builtin/tag.c to make it clear that it should not be used outside the
272
-current usage context.
273
-
274
---------------------------------------------------
275
-[Cooking]
276
-
385
* jj/icase-directory (2010-10-03) 8 commits
386
- Support case folding in git fast-import when core.ignorecase=true
387
- Support case folding for git add when core.ignorecase=true
@@ -284,11 +392,6 @@ current usage context.
392
- Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
393
- Makefile & configure: add a NO_FNMATCH flag
394
287
-* ab/require-perl-5.8 (2010-09-24) 2 commits
288
- (merged to 'next' on 2010-09-27 at 1fcdd3c)
289
- + perl: use "use warnings" instead of -w
290
- + perl: bump the required Perl version to 5.8 from 5.6.[21]
291
-
395
* en/and-cascade-tests (2010-10-03) 13 commits
396
- Introduce sane_unset and use it to ensure proper && chaining
397
- t7800 (difftool): add missing &&
@@ -303,9 +406,7 @@ current usage context.
406
- t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
407
- t4017 (diff-retval): replace manual exit code check with test_expect_code
408
- test-lib: make test_expect_code a test command
306
-
307
-Somewhat rerolled, but the largest one among the series was Nacked by a
308
-few people and needs to be rerolled again.
409
+ (this branch is used by jn/git-cmd-h-bypass-setup.)
410
411
* jk/no-textconv-symlink (2010-09-21) 1 commit
412
- diff: don't use pathname-based diff drivers for symlinks
@@ -317,20 +418,6 @@ few people and needs to be rerolled again.
418
- blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
419
(this branch uses jk/no-textconv-symlink.)
420
320
-* jp/send-email-to-cmd (2010-09-24) 1 commit
321
- (merged to 'next' on 2010-09-30 at 4284ddb)
322
- + git-send-email.perl: Add --to-cmd
323
-
324
-* kb/merge-recursive-rename-threshold (2010-09-27) 2 commits
325
- (merged to 'next' on 2010-09-30 at 4f33817)
326
- + diff: add synonyms for -M, -C, -B
327
- + merge-recursive: option to specify rename threshold
328
- (this branch uses jf/merge-ignore-ws.)
329
-
330
-* mg/fix-build-remote-helpers (2010-09-17) 1 commit
331
- (merged to 'next' on 2010-09-30 at 0583d5f)
332
- + remote-helpers: build in platform independent directory
333
-
421
* nd/struct-pathspec (2010-09-20) 5 commits
422
- ce_path_match: drop prefix matching in favor of match_pathspec
423
- Convert ce_path_match() to use struct pathspec
@@ -350,55 +437,14 @@ few people and needs to be rerolled again.
437
- Add struct pathspec
438
(this branch is used by nd/struct-pathspec.)
439
353
-* sb/send-email-use-to-from-input (2010-10-04) 2 commits
354
- (merged to 'next' on 2010-10-06 at 5e9cb61)
355
- + send-email: Don't leak To: headers between patches
356
- (merged to 'next' on 2010-09-30 at 513b6f1)
357
- + send-email: Use To: headers in patch files
358
-
440
* tc/smart-http-post-redirect (2010-09-25) 1 commit
441
- smart-http: Don't change POST to GET when following redirect
442
362
-* as/daemon-multi-listen (2010-08-30) 2 commits
363
- (merged to 'next' on 2010-09-30 at 8083bf4)
364
- + daemon: allow more than one host address given via --listen
365
- + daemon: add helper function named_sock_setup
366
-
367
-* dm/mergetool-vimdiff (2010-09-27) 3 commits
368
- (merged to 'next' on 2010-09-29 at c8e22ea)
369
- + mergetool-lib: make the three-way diff the default for vim/gvim
370
- (merged to 'next' on 2010-09-22 at 12f7559)
371
- + mergetool-lib: add a three-way diff view for vim/gvim
372
- + mergetool-lib: combine vimdiff and gvimdiff run blocks
373
-
443
* en/rename-d-f (2010-09-08) 2 commits
444
- merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
445
- t3509: Add rename + D/F conflict testcase that recursive strategy fails
446
(this branch is used by en/merge-recursive.)
447
379
-* kf/post-receive-sample-hook (2010-09-10) 1 commit
380
- (merged to 'next' on 2010-09-22 at db674a3)
381
- + post-receive-email: ensure sent messages are not empty
382
-
383
-I notice that it uses "PAGER= generate_email" where generate_email is a
384
-shell function, which may break in some implementations of POSIX /bin/sh.
385
-This is not a regression (the original also had the same issue), but
386
-somebody who cares enough might want to look into it.
387
-
388
-* ml/completion-zsh (2010-09-06) 1 commit
389
- (merged to 'next' on 2010-09-22 at d62d10e)
390
- + completion: make compatible with zsh
391
-
392
-Reported as breaking people with "set -u".
393
-
394
-* po/sendemail (2010-09-06) 3 commits
395
- (merged to 'next' on 2010-09-22 at 1105f62)
396
- + New send-email option smtpserveroption.
397
- + Remove @smtp_host_parts variable as not used.
398
- + Minor indentation fix.
399
-
400
-Will merge to 'master' shortly.
401
-
448
* jl/fetch-submodule-recursive (2010-09-19) 4 commits
449
- fetch: Get submodule paths from index and not from .gitmodules
450
- fetch: Fix a bug swallowing the output of recursive submodule fetching
@@ -407,29 +453,10 @@ Will merge to 'master' shortly.
453
454
I haven't picked up the rerolled one yet.
455
410
-* jf/merge-ignore-ws (2010-08-26) 4 commits
411
- (merged to 'next' on 2010-09-22 at 5161fb8)
412
- + merge-recursive: options to ignore whitespace changes
413
- + merge-recursive --patience
414
- + ll-merge: replace flag argument with options struct
415
- + merge-recursive: expose merge options for builtin merge
416
- (this branch is used by kb/merge-recursive-rename-threshold.)
417
-
418
-Possibly one of the star features of the coming release.
419
-
456
* tr/merge-unborn-clobber (2010-08-22) 1 commit
457
- Exhibit merge bug that clobbers index&WT
458
423
-* en/tree-walk-optim (2010-08-26) 4 commits
424
- (merged to 'next' on 2010-09-22 at 0601f1b)
425
- + diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
426
- + tree_entry_interesting(): Make return value more specific
427
- + tree-walk: Correct bitrotted comment about tree_entry()
428
- + Document pre-condition for tree_entry_interesting
429
-
430
-Will merge to 'master' shortly.
431
-
432
-* ab/i18n (2010-09-12) 159 commits
459
+* ab/i18n (2010-09-12) 160 commits
460
- po/sv.po: add Swedish translation
461
- gettextize: git-bisect bisect_next_check "You need to" message
462
- gettextize: git-bisect [Y/n] messages
@@ -576,6 +603,7 @@ Will merge to 'master' shortly.
603
- gettextize: git-init basic messages
604
- gettext tests: skip lib-gettext.sh tests under GETTEXT_POISON
605
- gettext tests: add GETTEXT_POISON=YesPlease Makefile parameter
606
+ - gettext.c: use libcharset.h instead of langinfo.h when available
607
- gettext.c: work around us not using setlocale(LC_CTYPE, "")
608
- builtin.h: Include gettext.h
609
- Makefile: use variables and shorter lines for xgettext