What's cooking (2010/11 #01)
Junio C Hamano committed
Nov 9, 2010 at 11:51 UTC
f523a493147118bc2805121072646789ace845da
1 file changed
+384
-265
whats-cooking.txt
+384
-265
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Oct 2010, #02; Tue, 26)
3
-X-master-at: 7ebee44167fc25b975f5543472c851ab1840af1b
4
-X-next-at: 2d0e57103f0af55abbbd7c61b29650463c3887cc
2
+Subject: What's cooking in git.git (Nov 2010, #01; Tue, 9)
3
+X-master-at: 6f10c4103dc7506623f89520ad03517b40788259
4
+X-next-at: d103166d7e9f1756878c3a913d6ffded69ea2f51
5
6
-What's cooking in git.git (Oct 2010, #02; Tue, 26)
6
+What's cooking in git.git (Nov 2010, #01; Tue, 9)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -21,38 +21,258 @@ been cooking for a very long time are long overdue.
21
--------------------------------------------------
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'
24
+* dk/maint-blame-el (2010-05-25) 1 commit
25
+ (merged to 'next' on 2010-11-05 at 8456c66)
26
+ + git-blame.el: Add (require 'format-spec)
27
+
28
+* ef/mingw-daemon (2010-11-04) 16 commits
29
+ - daemon: opt-out on features that require posix
30
+ - daemon: make --inetd and --detach incompatible
31
+ - daemon: use socklen_t
32
+ - mingw: use poll-emulation from gnulib
33
+ - mingw: import poll-emulation from gnulib
34
+ - daemon: get remote host address from root-process
35
+ - Improve the mingw getaddrinfo stub to handle more use cases
36
+ - daemon: use full buffered mode for stderr
37
+ - daemon: use run-command api for async serving
38
+ - mingw: add kill emulation
39
+ - mingw: support waitpid with pid > 0 and WNOHANG
40
+ - mingw: use real pid
41
+ - inet_ntop: fix a couple of old-style decls
42
+ - compat: add inet_pton and inet_ntop prototypes
43
+ - mingw: implement syslog
44
+ - mingw: add network-wrappers for daemon
45
+
46
+Will merge to 'next'.
47
+
48
+* jc/abbrev-guard (2010-10-28) 1 commit
49
+ - core.abbrevguard: Ensure short object names stay unique a bit longer
50
+
51
+* jc/emfile (2010-10-28) 2 commits
52
+ - A loose object is not corrupt if it cannot be read due to EMFILE
53
+ - read_sha1_file(): report correct name of packfile with a corrupt object
54
+ (this branch is used by sp/emfile.)
55
+
56
+Will merge to 'next'.
57
+
58
+* sp/emfile (2010-11-01) 2 commits
59
+ - Work around EMFILE when there are too many pack files
60
+ - Use git_open_noatime when accessing pack data
61
+ (this branch uses jc/emfile.)
62
+
63
+Will merge to 'next', but might want to restructure the API a bit.
64
+
65
+* jh/gitweb-caching (2010-11-01) 4 commits
66
+ - gitweb: Minimal testing of gitweb caching
67
+ - gitweb: File based caching layer (from git.kernel.org)
68
+ - gitweb: add output buffering and associated functions
69
+ - gitweb: Prepare for splitting gitweb
70
+ (this branch uses jn/gitweb-test.)
71
+
72
+* jk/maint-apply-no-binary (2010-10-18) 1 commit
73
+ (merged to 'next' on 2010-11-05 at 8b7543a)
74
+ + apply: don't segfault on binary files with missing data
75
+
76
+* jl/add-p-reverse-message (2010-10-27) 1 commit
77
+ - Correct help blurb in checkout -p and friends
78
+
79
+Looked Ok; will merge to 'next' soonish.
80
+
81
+* jl/clone-recurse-sm-synonym (2010-11-04) 1 commit
82
+ - clone: Add the --recurse-submodules option as alias for --recursive
83
+
84
+Looked Ok; will merge to 'next' soonish.
85
+
86
+* jl/maint-pull-tags-doc (2010-11-03) 1 commit
87
+ (merged to 'next' on 2010-11-05 at 861d16a)
88
+ + pull: Remove --tags option from manpage
89
+
90
+* jn/cherry-pick-refresh-index (2010-10-31) 1 commit
91
+ - cherry-pick/revert: transparently refresh index
92
+
93
+Looked Ok; will merge to 'next' soonish.
94
+
95
+* jn/parse-options-extra (2010-10-24) 4 commits
96
+ - update-index: migrate to parse-options API
97
+ - setup: save prefix (original cwd relative to toplevel) in startup_info
98
+ - parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
99
+ - parse-options: allow git commands to invent new option types
100
+
101
+Looked Ok; will merge to 'next' soonish.
102
+
103
+* kb/maint-submodule-savearg (2010-11-02) 2 commits
104
+ (merged to 'next' on 2010-11-05 at 10e1aeb)
105
+ + submodule: only preserve flags across recursive status/update invocations
106
+ + submodule: preserve all arguments exactly when recursing
107
+
108
+* md/interix (2010-10-27) 2 commits
109
+ - Interix: add configure checks
110
+ - add support for the SUA layer (interix; windows)
111
+
112
+Looked Ok, in the sense that I do not think it will negatively affect
113
+other platforms. Will merge to 'next' soonish.
114
+
115
+* mm/phrase-remote-tracking (2010-11-02) 10 commits
116
+ - git-branch.txt: mention --set-upstream as a way to change upstream configuration
117
+ - user-manual: remote-tracking can be checked out, with detached HEAD
118
+ - user-manual.txt: explain better the remote(-tracking) branch terms
119
+ - Change incorrect "remote branch" to "remote tracking branch" in C code
120
+ - Change incorrect uses of "remote branch" meaning "remote-tracking"
121
+ - Change "tracking branch" to "remote-tracking branch"
122
+ - everyday.txt: change "tracking branch" to "remote-tracking branch"
123
+ - Change remote tracking to remote-tracking in non-trivial places
124
+ - Replace "remote tracking" with "remote-tracking"
125
+ - Better "Changed but not updated" message in git-status
126
+
127
+Is everybody happy with this round? I'd prefer to merge it to 'next' or
128
+even 'master' and have further polishing be done, if necessary, in-tree.
129
+
130
+* nd/setup (2010-11-08) 44 commits
131
+ - t1020-subdirectory: test alias expansion in a subdirectory
132
+ - Remove all logic from get_git_work_tree()
133
+ - setup: rework setup_explicit_git_dir()
134
+ - setup: clean up setup_discovered_git_dir()
135
+ - setup: clean up setup_bare_git_dir()
136
+ - setup: limit get_git_work_tree()'s to explicit setup case only
137
+ - Use git_config_early() instead of git_config() during repo setup
138
+ - Add git_config_early()
139
+ - rev-parse: prints --git-dir relative to user's cwd
140
+ - git-rev-parse.txt: clarify --git-dir
141
+ - t1510: setup case #31
142
+ - t1510: setup case #30
143
+ - t1510: setup case #29
144
+ - t1510: setup case #28
145
+ - t1510: setup case #27
146
+ - t1510: setup case #26
147
+ - t1510: setup case #25
148
+ - t1510: setup case #24
149
+ - t1510: setup case #23
150
+ - t1510: setup case #22
151
+ - t1510: setup case #21
152
+ - t1510: setup case #20
153
+ - t1510: setup case #19
154
+ - t1510: setup case #18
155
+ - t1510: setup case #17
156
+ - t1510: setup case #16
157
+ - t1510: setup case #15
158
+ - t1510: setup case #14
159
+ - t1510: setup case #13
160
+ - t1510: setup case #12
161
+ - t1510: setup case #11
162
+ - t1510: setup case #10
163
+ - t1510: setup case #9
164
+ - t1510: setup case #8
165
+ - t1510: setup case #7
166
+ - t1510: setup case #6
167
+ - t1510: setup case #5
168
+ - t1510: setup case #4
169
+ - t1510: setup case #3
170
+ - t1510: setup case #2
171
+ - t1510: setup case #1
172
+ - t1510: setup case #0
173
+ - Add t1510 and basic rules that run repo setup
174
+ - builtins: print setup info if repo is found
175
+
176
+* rr/needs-clean-work-tree (2010-10-19) 1 commit
177
+ - Porcelain scripts: Rewrite cryptic "needs update" error message
178
+
179
+Looked Ok, will merge to 'next' soonish.
180
+
181
+* sn/diff-doc (2010-11-04) 3 commits
182
+ - docs: clarify git diff modes of operation
183
+ - diff,difftool: Don't use the {0,2} notation in usage strings
184
+ - CodingGuidelines: Add a section on writing documentation
185
+
186
+* tr/config-doc (2010-10-24) 2 commits
187
+ . Documentation: complete config list from other manpages
188
+ . Documentation: Move variables from config.txt to separate file
189
+
190
+This unfortunately heavily conflicts with patches in flight...
191
+
192
+* kb/maint-rebase-autosquash (2010-11-04) 2 commits
193
+ - rebase: teach --autosquash to match on sha1 in addition to message
194
+ - rebase: better rearranging of fixup!/squash! lines with --autosquash
195
+
196
+* kb/maint-status-cquote (2010-11-08) 1 commit
197
+ - status: Quote paths with spaces in short format
198
+
199
+* mg/maint-tag-rfc1991 (2010-11-06) 5 commits
200
+ - tag: recognize rfc1991 signatures
201
+ - tag: factor out sig detection for tag display
202
+ - tag: factor out sig detection for body edits
203
+ - verify-tag: factor out signature detection
204
+ - t/t7004-tag: test handling of rfc1991 signatures
205
+
206
+--------------------------------------------------
207
+[Graduated to "master"]
208
209
* aw/git-p4-deletion (2010-10-22) 1 commit
210
(merged to 'next' on 2010-10-26 at 5847c40)
211
+ Fix handling of git-p4 on deleted files
212
213
+--------------------------------------------------
214
+[Stalled]
215
+
216
+* nd/index-doc (2010-09-06) 1 commit
217
+ - doc: technical details about the index file format
218
+
219
+Half-written but it is a good start. I may need to give some help in
220
+describing more recent index extensions.
221
+
222
+* cb/ignored-paths-are-precious (2010-08-21) 1 commit
223
+ - checkout/merge: optionally fail operation when ignored files need to be overwritten
224
+
225
+This needs tests; also we know of longstanding bugs in related area that
226
+needs to be addressed---they do not have to be part of this series but
227
+their reproduction recipe would belong to the test script for this topic.
228
+
229
+It would hurt users to make the new feature on by default, especially the
230
+ones with subdirectories that come and go.
231
+
232
+* jk/tag-contains (2010-07-05) 4 commits
233
+ - Why is "git tag --contains" so slow?
234
+ - default core.clockskew variable to one day
235
+ - limit "contains" traversals based on commit timestamp
236
+ - tag: speed up --contains calculation
237
+
238
+The idea of the bottom one is probably Ok, except that the use of object
239
+flags needs to be rethought, or at least the helper needs to be moved to
240
+builtin/tag.c to make it clear that it should not be used outside the
241
+current usage context.
242
+
243
+--------------------------------------------------
244
+[Cooking]
245
+
246
+* ao/send-email-irt (2010-10-19) 1 commit
247
+ (merged to 'next' on 2010-11-08 at d103166)
248
+ + t9001: send-email interation with --in-reply-to and --chain-reply-to
249
+
250
* bg/maint-gitweb-test-lib (2010-10-20) 1 commit
38
- - t/gitweb-lib: Don't pass constant to decode_utf8
251
+ (merged to 'next' on 2010-11-05 at 0ead869)
252
+ + t/gitweb-lib: Don't pass constant to decode_utf8
253
254
* cm/diff-check-at-eol (2010-10-10) 1 commit
255
- diff --check: correct line numbers of new blank lines at EOF
256
43
-* fc/apply-p2-get-header-name (2010-10-21) 3 commits
257
+Looked Ok; will merge to 'next' soonish.
258
+
259
+* fc/apply-p2-get-header-name (2010-10-21) 2 commits
260
- test: git-apply -p2 rename/chmod only
45
- - fixup! Fix git-apply with
261
- Fix git-apply with -p greater than 1
262
263
+Looked Ok; will merge to 'next' soonish.
264
+
265
* jk/add-e-doc (2010-10-21) 1 commit
49
- - docs: give more hints about how "add -e" works
266
+ (merged to 'next' on 2010-11-05 at 389fee7)
267
+ + docs: give more hints about how "add -e" works
268
269
* jk/diff-CBM (2010-10-21) 1 commit
52
- - diff: report bogus input to -C/-M/-B
270
+ (merged to 'next' on 2010-11-05 at 9d1ec14)
271
+ + diff: report bogus input to -C/-M/-B
272
273
* jk/missing-config (2010-10-21) 1 commit
55
- - config: treat non-existent config files as empty
274
+ (merged to 'next' on 2010-11-05 at 31fda69)
275
+ + config: treat non-existent config files as empty
276
277
* jn/fast-import-fix (2010-10-20) 4 commits
278
- fast-import: do not clear notes in do_change_note_fanout()
@@ -60,6 +280,8 @@ been cooking for a very long time are long overdue.
280
- fast-import: tighten M 040000 syntax
281
- fast-import: filemodify after M 040000 <tree> "" crashes
282
283
+Looked Ok; will merge to 'next' soonish.
284
+
285
* jn/git-cmd-h-bypass-setup (2010-10-22) 7 commits
286
- update-index -h: show usage even with corrupt index
287
- merge -h: show usage even with corrupt index
@@ -73,246 +295,128 @@ been cooking for a very long time are long overdue.
295
* kb/blame-author-email (2010-10-15) 1 commit
296
- blame: Add option to show author email instead of name
297
298
+Looked Ok; will merge to 'next' soonish.
299
+
300
* 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
301
+ (merged to 'next' on 2010-11-05 at 861b5ac)
302
+ + diff: handle lines containing only whitespace and tabs better
303
+ + test-lib: extend test_decode_color to handle more color codes
304
305
* mg/make-prove (2010-10-14) 1 commit
81
- - test: allow running the tests under "prove"
306
+ (merged to 'next' on 2010-11-05 at ec4f806)
307
+ + test: allow running the tests under "prove"
308
309
* np/diff-in-corrupt-repository (2010-10-22) 1 commit
310
- diff: don't presume empty file when corresponding object is missing
311
312
+Looked Ok; will merge to 'next' soonish.
313
+
314
* np/pack-broken-boundary (2010-10-22) 1 commit
315
- make pack-objects a bit more resilient to repo corruption
316
317
+Looked Ok; will merge to 'next' soonish.
318
+
319
* tr/maint-git-repack-tmpfile (2010-10-19) 1 commit
90
- - repack: place temporary packs under .git/objects/pack/
320
+ (merged to 'next' on 2010-11-05 at 80ad03a)
321
+ + repack: place temporary packs under .git/objects/pack/
322
323
* 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
324
+ (merged to 'next' on 2010-11-05 at a2873a4)
325
+ + merge-file: correctly find files when called in subdir
326
+ + prefix_filename(): safely handle the case where pfx_len=0
327
96
---------------------------------------------------
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)
106
- + send-email: extract_valid_address use qr// regexes
107
- + send-email: is_rfc2047_quoted use qr// regexes
108
- + send-email: use Perl idioms in while loop
109
- + send-email: make_message_id use "require" instead of "use"
110
- + send-email: send_message die on $!, not $?
111
- + send-email: use (?:) instead of () if no match variables are needed
112
- + send-email: sanitize_address use qq["foo"], not "\"foo\""
113
- + send-email: sanitize_address use $foo, not "$foo"
114
- + send-email: use \E***\Q instead of \*\*\*
115
- + send-email: cleanup_compose_files doesn't need a prototype
116
- + send-email: unique_email_list doesn't need a prototype
117
- + send-email: file_declares_8bit_cte doesn't need a prototype
118
- + send-email: get_patch_subject doesn't need a prototype
119
- + send-email: use lexical filehandles during sending
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]
328
+* yd/dir-rename (2010-10-29) 5 commits
329
+ - Allow hiding renames of individual files involved in a directory rename.
330
+ - Unified diff output format for bulk moves.
331
+ - Add testcases for the --detect-bulk-moves diffcore flag.
332
+ - Raw diff output format for bulk moves.
333
+ - Introduce bulk-move detection in diffcore.
334
335
* 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
336
+ (merged to 'next' on 2010-11-05 at b3b09f3)
337
+ + diff: avoid repeated scanning while looking for funcname
338
+ + do not search functions for patch ID
339
+ + add rebase patch id tests
340
341
* 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
254
- - merge_content(): Check whether D/F conflicts are still present
255
- - conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
256
- - conflict_rename_delete(): Check whether D/F conflicts are still present
257
- - merge-recursive: Delay modify/delete conflicts if D/F conflict present
258
- - merge-recursive: Delay content merging for renames
259
- - merge-recursive: Delay handling of rename/delete conflicts
260
- - merge-recursive: Move handling of double rename of one file to other file
261
- - merge-recursive: Move handling of double rename of one file to two
262
- - merge-recursive: Avoid doubly merging rename/add conflict contents
263
- - merge-recursive: Update merge_content() call signature
264
- - merge-recursive: Update conflict_rename_rename_1to2() call signature
265
- - merge-recursive: Structure process_df_entry() to handle more cases
266
- - merge-recursive: Have process_entry() skip D/F or rename entries
267
- - merge-recursive: New function to assist resolving renames in-core only
268
- - merge-recursive: New data structures for deferring of D/F conflicts
269
- - merge-recursive: Move process_entry's content merging into a function
270
- - merge-recursive: Move delete/modify handling into dedicated function
271
- - merge-recursive: Move rename/delete handling into dedicated function
272
- - merge-recursive: Nuke rename/directory conflict detection
273
- - merge-recursive: Rename conflict_rename_rename*() for clarity
274
- - merge-recursive: Small code clarification -- variable name and comments
275
- - t6036: Add testcase for undetected conflict
276
- - t6036: Add a second testcase similar to the first but with content changes
277
- - t6036: Test index and worktree state, not just that merge fails
278
- - t6020: Add a testcase for modify/delete + directory/file conflict
279
- - t6020: Modernize style a bit
280
- - t6022: Add tests for rename/rename combined with D/F conflicts
281
- - t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
282
- - t6022: Add tests with both rename source & dest involved in D/F conflicts
283
- - t6022: Add tests for reversing order of merges when D/F conflicts present
284
- - t6022: Add test combinations of {content conflict?, D/F conflict remains?}
285
- - t6032: Add a test checking for excessive output from merge
286
- - merge-recursive: Restructure showing how to chain more process_* functions
287
- - t3030: Add a testcase for resolvable rename/add conflict with symlinks
288
- - Merge branch 'en/rename-d-f' into en/merge-recursive
342
+ (merged to 'next' on 2010-11-05 at 16902eb)
343
+ + merge-recursive:make_room_for_directories - work around dumb compilers
344
+ + merge-recursive: Remove redundant path clearing for D/F conflicts
345
+ + merge-recursive: Make room for directories in D/F conflicts
346
+ + handle_delete_modify(): Check whether D/F conflicts are still present
347
+ + merge_content(): Check whether D/F conflicts are still present
348
+ + conflict_rename_rename_1to2(): Fix checks for presence of D/F conflicts
349
+ + conflict_rename_delete(): Check whether D/F conflicts are still present
350
+ + merge-recursive: Delay modify/delete conflicts if D/F conflict present
351
+ + merge-recursive: Delay content merging for renames
352
+ + merge-recursive: Delay handling of rename/delete conflicts
353
+ + merge-recursive: Move handling of double rename of one file to other file
354
+ + merge-recursive: Move handling of double rename of one file to two
355
+ + merge-recursive: Avoid doubly merging rename/add conflict contents
356
+ + merge-recursive: Update merge_content() call signature
357
+ + merge-recursive: Update conflict_rename_rename_1to2() call signature
358
+ + merge-recursive: Structure process_df_entry() to handle more cases
359
+ + merge-recursive: Have process_entry() skip D/F or rename entries
360
+ + merge-recursive: New function to assist resolving renames in-core only
361
+ + merge-recursive: New data structures for deferring of D/F conflicts
362
+ + merge-recursive: Move process_entry's content merging into a function
363
+ + merge-recursive: Move delete/modify handling into dedicated function
364
+ + merge-recursive: Move rename/delete handling into dedicated function
365
+ + merge-recursive: Nuke rename/directory conflict detection
366
+ + merge-recursive: Rename conflict_rename_rename*() for clarity
367
+ + merge-recursive: Small code clarification -- variable name and comments
368
+ + t6036: Add testcase for undetected conflict
369
+ + t6036: Add a second testcase similar to the first but with content changes
370
+ + t6036: Test index and worktree state, not just that merge fails
371
+ + t6020: Add a testcase for modify/delete + directory/file conflict
372
+ + t6020: Modernize style a bit
373
+ + t6022: Add tests for rename/rename combined with D/F conflicts
374
+ + t6022: Add paired rename+D/F conflict: (two/file, one/file) -> (one, two)
375
+ + t6022: Add tests with both rename source & dest involved in D/F conflicts
376
+ + t6022: Add tests for reversing order of merges when D/F conflicts present
377
+ + t6022: Add test combinations of {content conflict?, D/F conflict remains?}
378
+ + t6032: Add a test checking for excessive output from merge
379
+ + merge-recursive: Restructure showing how to chain more process_* functions
380
+ + t3030: Add a testcase for resolvable rename/add conflict with symlinks
381
+ + Merge branch 'en/rename-d-f' into en/merge-recursive
382
(this branch uses en/rename-d-f.)
383
384
* il/remote-fd-ext (2010-10-12) 3 commits
292
- - git-remote-ext
293
- - git-remote-fd
294
- - Add bidirectional_transfer_loop()
385
+ (merged to 'next' on 2010-11-05 at 7413413)
386
+ + git-remote-ext
387
+ + git-remote-fd
388
+ + Add bidirectional_transfer_loop()
389
390
* jn/gitweb-test (2010-09-26) 4 commits
297
- - gitweb/Makefile: Include gitweb/config.mak
298
- - gitweb/Makefile: Add 'test' and 'test-installed' targets
299
- - t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
300
- - gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
391
+ (merged to 'next' on 2010-11-05 at 90b3adf)
392
+ + gitweb/Makefile: Include gitweb/config.mak
393
+ + gitweb/Makefile: Add 'test' and 'test-installed' targets
394
+ + t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
395
+ + gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
396
+ (this branch is used by jh/gitweb-caching.)
397
398
* ak/apply-non-git-epoch (2010-09-29) 1 commit
399
- apply: Recognize epoch timestamps with : in the timezone
400
401
+Looked Ok; will merge to 'next' soonish.
402
+
403
* ak/submodule-sync (2010-10-08) 1 commit
306
- - submodule sync: Update "submodule.<name>.url" for empty directories
404
+ (merged to 'next' on 2010-11-05 at 5a2f940)
405
+ + submodule sync: Update "submodule.<name>.url" for empty directories
406
407
* cb/leading-path-removal (2010-10-09) 5 commits
309
- - do not overwrite files in leading path
310
- - lstat_cache: optionally return match_len
311
- - add function check_ok_to_remove()
312
- - t7607: add leading-path tests
313
- - t7607: use test-lib functions and check MERGE_HEAD
314
-
315
-* jh/notes-merge (2010-10-21) 21 commits
408
+ (merged to 'next' on 2010-11-05 at 55ea322)
409
+ + do not overwrite files in leading path
410
+ + lstat_cache: optionally return match_len
411
+ + add function check_ok_to_remove()
412
+ + t7607: add leading-path tests
413
+ + t7607: use test-lib functions and check MERGE_HEAD
414
+
415
+* jh/notes-merge (2010-10-29) 25 commits
416
+ - portability fix for c8af1a3b2f
417
+ - notes-merge series: fixup minor style issues
418
+ - Provide 'git merge --abort' as a synonym to 'git reset --merge'
419
+ - cmd_merge(): Parse options before checking MERGE_HEAD
420
- Provide 'git notes get-ref' to easily retrieve current notes ref
421
- git notes merge: Add testcases for merging notes trees at different fanouts
422
- git notes merge: Add another auto-resolving strategy: "cat_sort_uniq"
@@ -329,58 +433,63 @@ current usage context.
433
- notes.c: Use two newlines (instead of one) when concatenating notes
434
- (trivial) t3303: Indent with tabs instead of spaces for consistency
435
- notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond
332
- - notes.h/c: Clarify the handling of notes objects that are == null_sha1
436
+ - notes.h/c: Allow combine_notes functions to remove notes
437
- notes.c: Reorder functions in preparation for next commit
438
- notes.h: Make default_notes_ref() available in notes API
439
- (trivial) notes.h: Minor documentation fixes to copy_notes()
440
- notes.c: Hexify SHA1 in die() message from init_notes()
441
442
+Still in flux?
443
+
444
* jk/maint-rev-list-nul (2010-10-07) 1 commit
339
- - rev-list: handle %x00 NUL in user format
445
+ (merged to 'next' on 2010-11-05 at 406cba1)
446
+ + rev-list: handle %x00 NUL in user format
447
448
* jk/push-progress (2010-10-17) 8 commits
342
- - push: pass --progress down to git-pack-objects
343
- - t5523-push-upstream: test progress messages
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
449
+ (merged to 'next' on 2010-11-05 at 9207c6d)
450
+ + push: pass --progress down to git-pack-objects
451
+ + t5523-push-upstream: test progress messages
452
+ + t5523-push-upstream: add function to ensure fresh upstream repo
453
+ + test_terminal: ensure redirections work reliably
454
+ + test_terminal: catch use without TTY prerequisite
455
+ + test-lib: allow test code to check the list of declared prerequisites
456
+ + tests: test terminal output to both stdout and stderr
457
+ + tests: factor out terminal handling from t7006
458
459
* 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.
460
+ (merged to 'next' on 2010-11-05 at ef1e754)
461
+ + t4203: do not let "git shortlog" DWIM based on tty
462
+ + t4203 (mailmap): stop hardcoding commit ids and dates
463
+ + mailmap: fix use of freed memory
464
465
* jn/send-pack-error (2010-10-16) 1 commit
359
- - send-pack: avoid redundant "pack-objects died with strange error"
466
+ (merged to 'next' on 2010-11-05 at ef559d4)
467
+ + send-pack: avoid redundant "pack-objects died with strange error"
468
469
* kb/completion-checkout (2010-10-12) 1 commit
362
- - completion: Support the DWIM mode for git checkout
470
+ (merged to 'next' on 2010-11-05 at 6836d70)
471
+ + completion: Support the DWIM mode for git checkout
472
364
-* pn/commit-autosquash (2010-10-07) 8 commits
473
+* pn/commit-autosquash (2010-11-02) 6 commits
474
- add tests of commit --squash
475
- commit: --squash option for use with rebase --autosquash
476
- add tests of commit --fixup
477
- commit: --fixup option for use with rebase --autosquash
478
- pretty.c: teach format_commit_message() to reencode the output
370
- - pretty.c: helper methods for getting output encodings
371
- - commit.c: new function for looking up a comit by name
372
- - commit.c: prefer get_header() to manual searching
479
+ - commit: helper methods to reduce redundant blocks of code
480
481
* sg/bisect (2010-10-10) 3 commits
375
- - bisect: check for mandatory argument of 'bisect replay'
376
- - bisect: improve error msg of 'bisect reset' when original HEAD is deleted
377
- - bisect: improve error message of 'bisect log' while not bisecting
482
+ (merged to 'next' on 2010-11-05 at 4a8b88d)
483
+ + bisect: check for mandatory argument of 'bisect replay'
484
+ + bisect: improve error msg of 'bisect reset' when original HEAD is deleted
485
+ + bisect: improve error message of 'bisect log' while not bisecting
486
487
* sg/completion (2010-10-11) 4 commits
380
- - bash: support pretty format aliases
381
- - bash: support more 'git notes' subcommands and their options
382
- - bash: not all 'git bisect' subcommands make sense when not bisecting
383
- - bash: offer refs for 'git bisect start'
488
+ (merged to 'next' on 2010-11-05 at 4967932)
489
+ + bash: support pretty format aliases
490
+ + bash: support more 'git notes' subcommands and their options
491
+ + bash: not all 'git bisect' subcommands make sense when not bisecting
492
+ + bash: offer refs for 'git bisect start'
493
494
* jj/icase-directory (2010-10-03) 8 commits
495
- Support case folding in git fast-import when core.ignorecase=true
@@ -409,13 +518,15 @@ The new test seems to make t4203 break intermittently.
518
(this branch is used by jn/git-cmd-h-bypass-setup.)
519
520
* jk/no-textconv-symlink (2010-09-21) 1 commit
412
- - diff: don't use pathname-based diff drivers for symlinks
521
+ (merged to 'next' on 2010-11-05 at 0a99e75)
522
+ + diff: don't use pathname-based diff drivers for symlinks
523
(this branch is used by ks/no-textconv-symlink.)
524
525
* ks/no-textconv-symlink (2010-09-29) 3 commits
416
- - blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
417
- - blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
418
- - blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
526
+ (merged to 'next' on 2010-11-05 at 32f0580)
527
+ + blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
528
+ + blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
529
+ + blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
530
(this branch uses jk/no-textconv-symlink.)
531
532
* nd/struct-pathspec (2010-09-20) 5 commits
@@ -426,6 +537,9 @@ The new test seems to make t4203 break intermittently.
537
- pathspec: mark wildcard pathspecs from the beginning
538
(this branch uses en/object-list-with-pathspec.)
539
540
+This is related to something I have long been wanting to see happen. Will
541
+give it another look and merge to 'next'.
542
+
543
* en/object-list-with-pathspec (2010-09-20) 8 commits
544
- Add testcases showing how pathspecs are handled with rev-list --objects
545
- Make rev-list --objects work together with pathspecs
@@ -440,9 +554,11 @@ The new test seems to make t4203 break intermittently.
554
* tc/smart-http-post-redirect (2010-09-25) 1 commit
555
- smart-http: Don't change POST to GET when following redirect
556
557
+Will merge to 'next' to see what happens.
558
+
559
* 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
560
+ + merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
561
+ + t3509: Add rename + D/F conflict testcase that recursive strategy fails
562
(this branch is used by en/merge-recursive.)
563
564
* jl/fetch-submodule-recursive (2010-09-19) 4 commits
@@ -451,12 +567,11 @@ The new test seems to make t4203 break intermittently.
567
- Submodules: Add the new "fetch" config option for fetch and pull
568
- fetch/pull: Recursively fetch populated submodules
569
454
-I haven't picked up the rerolled one yet.
455
-
570
* tr/merge-unborn-clobber (2010-08-22) 1 commit
571
- Exhibit merge bug that clobbers index&WT
572
459
-* ab/i18n (2010-09-12) 160 commits
573
+* ab/i18n (2010-10-07) 161 commits
574
+ - po/de.po: complete German translation
575
- po/sv.po: add Swedish translation
576
- gettextize: git-bisect bisect_next_check "You need to" message
577
- gettextize: git-bisect [Y/n] messages
@@ -617,3 +732,7 @@ I haven't picked up the rerolled one yet.
732
- builtin: use builtin.h for all builtin commands
733
- tests: use test_cmp instead of piping to diff(1)
734
- t7004-tag.sh: re-arrange git tag comment for clarity
735
+
736
+Will merge to 'next' to see what happens; it is getting ridiculously
737
+painful to keep re-resolving the conflicts with other topics in flight,
738
+even with the help with rerere.