What's cooking (2010/11 #02)
Junio C Hamano committed
Nov 17, 2010 at 16:44 UTC
25412203bc38e4dec70de59aa31d2e5d13d3d57c
1 file changed
+413
-289
whats-cooking.txt
+413
-289
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Nov 2010, #01; Tue, 9)
3
-X-master-at: 6f10c4103dc7506623f89520ad03517b40788259
4
-X-next-at: d103166d7e9f1756878c3a913d6ffded69ea2f51
2
+Subject: What's cooking in git.git (Nov 2010, #02; Wed, 17)
3
+X-master-at: 03276d94bcdb7d463a029936933898948c0669ac
4
+X-next-at: ec7d70969ee62009146d3636340c5e7023f24ff9
5
6
-What's cooking in git.git (Nov 2010, #01; Tue, 9)
6
+What's cooking in git.git (Nov 2010, #02; Wed, 17)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -11,50 +11,301 @@ 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
-
14
--------------------------------------------------
22
-[New Topics]
15
+[Graduated to "master"]
16
+
17
+* ak/submodule-sync (2010-10-08) 1 commit
18
+ (merged to 'next' on 2010-11-05 at 5a2f940)
19
+ + submodule sync: Update "submodule.<name>.url" for empty directories
20
+
21
+* bg/maint-gitweb-test-lib (2010-10-20) 1 commit
22
+ (merged to 'next' on 2010-11-05 at 0ead869)
23
+ + t/gitweb-lib: Don't pass constant to decode_utf8
24
+
25
+* cb/diff-fname-optim (2010-09-26) 3 commits
26
+ (merged to 'next' on 2010-11-05 at b3b09f3)
27
+ + diff: avoid repeated scanning while looking for funcname
28
+ + do not search functions for patch ID
29
+ + add rebase patch id tests
30
31
* dk/maint-blame-el (2010-05-25) 1 commit
32
(merged to 'next' on 2010-11-05 at 8456c66)
33
+ git-blame.el: Add (require 'format-spec)
34
35
+* jk/maint-apply-no-binary (2010-10-18) 1 commit
36
+ (merged to 'next' on 2010-11-05 at 8b7543a)
37
+ + apply: don't segfault on binary files with missing data
38
+
39
+* jk/maint-rev-list-nul (2010-10-07) 1 commit
40
+ (merged to 'next' on 2010-11-05 at 406cba1)
41
+ + rev-list: handle %x00 NUL in user format
42
+
43
+* jk/missing-config (2010-10-21) 1 commit
44
+ (merged to 'next' on 2010-11-05 at 31fda69)
45
+ + config: treat non-existent config files as empty
46
+
47
+* jk/no-textconv-symlink (2010-09-21) 1 commit
48
+ (merged to 'next' on 2010-11-05 at 0a99e75)
49
+ + diff: don't use pathname-based diff drivers for symlinks
50
+ (this branch is used by ks/no-textconv-symlink.)
51
+
52
+* jk/push-progress (2010-10-17) 8 commits
53
+ (merged to 'next' on 2010-11-05 at 9207c6d)
54
+ + push: pass --progress down to git-pack-objects
55
+ + t5523-push-upstream: test progress messages
56
+ + t5523-push-upstream: add function to ensure fresh upstream repo
57
+ + test_terminal: ensure redirections work reliably
58
+ + test_terminal: catch use without TTY prerequisite
59
+ + test-lib: allow test code to check the list of declared prerequisites
60
+ + tests: test terminal output to both stdout and stderr
61
+ + tests: factor out terminal handling from t7006
62
+
63
+* jl/maint-pull-tags-doc (2010-11-03) 1 commit
64
+ (merged to 'next' on 2010-11-05 at 861d16a)
65
+ + pull: Remove --tags option from manpage
66
+
67
+* jm/mailmap (2010-10-19) 3 commits
68
+ (merged to 'next' on 2010-11-05 at ef1e754)
69
+ + t4203: do not let "git shortlog" DWIM based on tty
70
+ + t4203 (mailmap): stop hardcoding commit ids and dates
71
+ + mailmap: fix use of freed memory
72
+
73
+* jn/gitweb-test (2010-09-26) 4 commits
74
+ (merged to 'next' on 2010-11-05 at 90b3adf)
75
+ + gitweb/Makefile: Include gitweb/config.mak
76
+ + gitweb/Makefile: Add 'test' and 'test-installed' targets
77
+ + t/gitweb-lib.sh: Add support for GITWEB_TEST_INSTALLED
78
+ + gitweb: Move call to evaluate_git_version after evaluate_gitweb_config
79
+ (this branch is used by jh/gitweb-caching.)
80
+
81
+* jn/send-pack-error (2010-10-16) 1 commit
82
+ (merged to 'next' on 2010-11-05 at ef559d4)
83
+ + send-pack: avoid redundant "pack-objects died with strange error"
84
+
85
+* kb/completion-checkout (2010-10-12) 1 commit
86
+ (merged to 'next' on 2010-11-05 at 6836d70)
87
+ + completion: Support the DWIM mode for git checkout
88
+
89
+* kb/maint-diff-ws-check (2010-10-20) 2 commits
90
+ (merged to 'next' on 2010-11-05 at 861b5ac)
91
+ + diff: handle lines containing only whitespace and tabs better
92
+ + test-lib: extend test_decode_color to handle more color codes
93
+
94
+* kb/maint-submodule-savearg (2010-11-02) 2 commits
95
+ (merged to 'next' on 2010-11-05 at 10e1aeb)
96
+ + submodule: only preserve flags across recursive status/update invocations
97
+ + submodule: preserve all arguments exactly when recursing
98
+
99
+* ks/no-textconv-symlink (2010-09-29) 3 commits
100
+ (merged to 'next' on 2010-11-05 at 32f0580)
101
+ + blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
102
+ + blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
103
+ + blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
104
+ (this branch uses jk/no-textconv-symlink.)
105
+
106
+* mg/make-prove (2010-10-14) 1 commit
107
+ (merged to 'next' on 2010-11-05 at ec4f806)
108
+ + test: allow running the tests under "prove"
109
+
110
+* sg/bisect (2010-10-10) 3 commits
111
+ (merged to 'next' on 2010-11-05 at 4a8b88d)
112
+ + bisect: check for mandatory argument of 'bisect replay'
113
+ + bisect: improve error msg of 'bisect reset' when original HEAD is deleted
114
+ + bisect: improve error message of 'bisect log' while not bisecting
115
+
116
+* sg/completion (2010-10-11) 4 commits
117
+ (merged to 'next' on 2010-11-05 at 4967932)
118
+ + bash: support pretty format aliases
119
+ + bash: support more 'git notes' subcommands and their options
120
+ + bash: not all 'git bisect' subcommands make sense when not bisecting
121
+ + bash: offer refs for 'git bisect start'
122
+
123
+* tr/maint-git-repack-tmpfile (2010-10-19) 1 commit
124
+ (merged to 'next' on 2010-11-05 at 80ad03a)
125
+ + repack: place temporary packs under .git/objects/pack/
126
+
127
+* tr/maint-merge-file-subdir (2010-10-17) 2 commits
128
+ (merged to 'next' on 2010-11-05 at a2873a4)
129
+ + merge-file: correctly find files when called in subdir
130
+ + prefix_filename(): safely handle the case where pfx_len=0
131
+
132
+--------------------------------------------------
133
+[New Topics]
134
+
135
+* cb/maint-orphan-merge-noclobber (2010-11-14) 1 commit
136
+ (merged to 'next' on 2010-11-15 at 046c5e5)
137
+ + do not overwrite untracked during merge from unborn branch
138
+
139
+Will merge to master soonish.
140
+
141
+* gb/gitweb-remote-heads (2010-11-11) 11 commits
142
+ - git instaweb: enable remote_heads
143
+ - gitweb: group remote heads by remote
144
+ - gitweb: provide a routine to display (sub)sections
145
+ - gitweb: refactor repository URL printing
146
+ - gitweb: remotes view for a single remote
147
+ - gitweb: allow action specialization in page header
148
+ - gitweb: nagivation menu for tags, heads and remotes
149
+ - gitweb: separate heads and remotes lists
150
+ - gitweb: git_get_heads_list accepts an optional list of refs
151
+ - gitweb: introduce remote_heads feature
152
+ - gitweb: use fullname as hash_base in heads link
153
+
154
+Acked by Jakub. Will merge to next.
155
+
156
+* gc/http-with-non-ascii-username-url (2010-11-14) 2 commits
157
+ - Fix username and password extraction from HTTP URLs
158
+ - t5550: test HTTP authentication and userinfo decoding
159
+
160
+Acked by Tay. Will merge to next.
161
+
162
+* jk/maint-decorate-01-bool (2010-11-17) 1 commit
163
+ - log.decorate: accept 0/1 bool values
164
+ (this branch is used by jk/pager-per-command.)
165
+
166
+Looked reasonable. Will merge to next.
167
+
168
+* jk/pager-per-command (2010-11-17) 1 commit
169
+ - allow command-specific pagers in pager.<cmd>
170
+ (this branch uses jk/maint-decorate-01-bool.)
171
+
172
+Looked reasonable. Will merge to next.
173
+
174
+* jn/getenv-poison (2010-11-12) 1 commit
175
+ . add GETENV_POISON option to simulate unfriendly getenv()
176
+ (this branch uses ks/maint-getenv-fix.)
177
+
178
+* jn/gitweb-time-hires-comes-with-5.8 (2010-11-09) 1 commit
179
+ - gitweb: Time::HiRes is in core for Perl 5.8
180
+
181
+Looked reasonable. Will merge to next.
182
+
183
+* jn/ignore-doc (2010-11-10) 2 commits
184
+ - Documentation: point to related commands from gitignore
185
+ - Documentation: split gitignore page into sections
186
+
187
+Looked reasonable. Will merge to next.
188
+
189
+* jn/thinner-wrapper (2010-11-06) 7 commits
190
+ - Remove pack file handling dependency from wrapper.o
191
+ - pack-objects: mark file-local variable static
192
+ - wrapper: give zlib wrappers their own translation unit
193
+ - strbuf: move strbuf_branchname to sha1_name.c
194
+ - path helpers: move git_mkstemp* to wrapper.c
195
+ - wrapper: move odb_* to environment.c
196
+ - wrapper: move xmmap() to sha1_file.c
197
+
198
+Looked reasonable. Will merge to next.
199
+
200
+* ks/maint-getenv-fix (2010-11-11) 1 commit
201
+ - setup: make sure git_dir path is in a permanent buffer, getenv(3) case
202
+ (this branch is used by jn/getenv-poison.)
203
+
204
+Looked reasonable. Will merge to next.
205
+
206
+* nd/extended-sha1-relpath (2010-11-11) 2 commits
207
+ - get_sha1: support relative path ":path" syntax
208
+ - Make prefix_path() return char* without const
209
+ (this branch uses jn/parse-options-extra.)
210
+
211
+Perhaps needs a documentation update.
212
+
213
+* nd/maint-fix-add-typo-detection (2010-11-11) 1 commit
214
+ - add: do not rely on dtype being NULL behavior
215
+
216
+Looked reasonable. Will merge to next.
217
+
218
+* rs/opt-help-text (2010-11-08) 8 commits
219
+ (merged to 'next' on 2010-11-15 at 631c222)
220
+ + verify-tag: document --verbose
221
+ + branch: improve --verbose description
222
+ + archive: improve --verbose description
223
+ + Describe various forms of "be quiet" using OPT__QUIET
224
+ + add OPT__FORCE
225
+ + add description parameter to OPT__QUIET
226
+ + add description parameter to OPT__DRY_RUN
227
+ + add description parameter to OPT__VERBOSE
228
+
229
+Will merge to master soonish.
230
+
231
+--------------------------------------------------
232
+[Stalled]
233
+
234
+* nd/index-doc (2010-09-06) 1 commit
235
+ - doc: technical details about the index file format
236
+
237
+Half-written but it is a good start. I may need to give some help in
238
+describing more recent index extensions.
239
+
240
+* cb/ignored-paths-are-precious (2010-08-21) 1 commit
241
+ - checkout/merge: optionally fail operation when ignored files need to be overwritten
242
+
243
+This needs tests; also we know of longstanding bugs in related area that
244
+needs to be addressed---they do not have to be part of this series but
245
+their reproduction recipe would belong to the test script for this topic.
246
+
247
+It would hurt users to make the new feature on by default, especially the
248
+ones with subdirectories that come and go.
249
+
250
+* jk/tag-contains (2010-07-05) 4 commits
251
+ - Why is "git tag --contains" so slow?
252
+ - default core.clockskew variable to one day
253
+ - limit "contains" traversals based on commit timestamp
254
+ - tag: speed up --contains calculation
255
+
256
+The idea of the bottom one is probably Ok, except that the use of object
257
+flags needs to be rethought, or at least the helper needs to be moved to
258
+builtin/tag.c to make it clear that it should not be used outside the
259
+current usage context.
260
+
261
+* jh/gitweb-caching (2010-11-01) 4 commits
262
+ . gitweb: Minimal testing of gitweb caching
263
+ . gitweb: File based caching layer (from git.kernel.org)
264
+ . gitweb: add output buffering and associated functions
265
+ . gitweb: Prepare for splitting gitweb
266
+
267
+Temporarily ejected while I shuffled jn/gitweb-testing; will queue the
268
+latest back in pu or perhaps in next.
269
+
270
+* tr/config-doc (2010-10-24) 2 commits
271
+ . Documentation: complete config list from other manpages
272
+ . Documentation: Move variables from config.txt to separate file
273
+
274
+This unfortunately heavily conflicts with patches in flight...
275
+
276
+--------------------------------------------------
277
+[Cooking]
278
+
279
* 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'.
280
+ (merged to 'next' on 2010-11-17 at 4a295c7)
281
+ + daemon: opt-out on features that require posix
282
+ + daemon: make --inetd and --detach incompatible
283
+ + daemon: use socklen_t
284
+ + mingw: use poll-emulation from gnulib
285
+ + mingw: import poll-emulation from gnulib
286
+ + daemon: get remote host address from root-process
287
+ + Improve the mingw getaddrinfo stub to handle more use cases
288
+ + daemon: use full buffered mode for stderr
289
+ + daemon: use run-command api for async serving
290
+ + mingw: add kill emulation
291
+ + mingw: support waitpid with pid > 0 and WNOHANG
292
+ + mingw: use real pid
293
+ + inet_ntop: fix a couple of old-style decls
294
+ + compat: add inet_pton and inet_ntop prototypes
295
+ + mingw: implement syslog
296
+ + mingw: add network-wrappers for daemon
297
298
* jc/abbrev-guard (2010-10-28) 1 commit
299
- core.abbrevguard: Ensure short object names stay unique a bit longer
300
301
+Will merge to next.
302
+
303
* 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
304
+ (merged to 'next' on 2010-11-17 at dac1bc6)
305
+ + A loose object is not corrupt if it cannot be read due to EMFILE
306
+ + read_sha1_file(): report correct name of packfile with a corrupt object
307
(this branch is used by sp/emfile.)
308
56
-Will merge to 'next'.
57
-
309
* sp/emfile (2010-11-01) 2 commits
310
- Work around EMFILE when there are too many pack files
311
- Use git_open_noatime when accessing pack data
@@ -62,76 +313,55 @@ Will merge to 'next'.
313
314
Will merge to 'next', but might want to restructure the API a bit.
315
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
-
316
* 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.
317
+ (merged to 'next' on 2010-11-17 at db2ce14)
318
+ + Correct help blurb in checkout -p and friends
319
320
* 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
321
+ (merged to 'next' on 2010-11-17 at 8c326c2)
322
+ + clone: Add the --recurse-submodules option as alias for --recursive
323
324
* 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.
325
+ (merged to 'next' on 2010-11-17 at 75e9103)
326
+ + cherry-pick/revert: transparently refresh index
327
328
* jn/parse-options-extra (2010-10-24) 4 commits
329
- update-index: migrate to parse-options API
330
- setup: save prefix (original cwd relative to toplevel) in startup_info
331
- parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION
332
- parse-options: allow git commands to invent new option types
333
+ (this branch is used by nd/extended-sha1-relpath.)
334
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
335
+Wait for a reroll from Jonathan (2010-11-09).
336
337
* 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.
338
+ (merged to 'next' on 2010-11-17 at 2a8b562)
339
+ + Interix: add configure checks
340
+ + add support for the SUA layer (interix; windows)
341
342
* 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
343
+ (merged to 'next' on 2010-11-15 at 07d67f4)
344
+ + git-branch.txt: mention --set-upstream as a way to change upstream configuration
345
+ + user-manual: remote-tracking can be checked out, with detached HEAD
346
+ + user-manual.txt: explain better the remote(-tracking) branch terms
347
+ + Change incorrect "remote branch" to "remote tracking branch" in C code
348
+ + Change incorrect uses of "remote branch" meaning "remote-tracking"
349
+ + Change "tracking branch" to "remote-tracking branch"
350
+ + everyday.txt: change "tracking branch" to "remote-tracking branch"
351
+ + Change remote tracking to remote-tracking in non-trivial places
352
+ + Replace "remote tracking" with "remote-tracking"
353
+ + Better "Changed but not updated" message in git-status
354
+
355
+Will merge to master soonish.
356
+
357
+* nd/setup (2010-11-11) 47 commits
358
+ - git.txt: correct where --work-tree path is relative to
359
+ - Revert "Documentation: always respect core.worktree if set"
360
+ - t0001: test git init when run via an alias
361
- Remove all logic from get_git_work_tree()
362
- setup: rework setup_explicit_git_dir()
363
- setup: clean up setup_discovered_git_dir()
364
+ - t1020-subdirectory: test alias expansion in a subdirectory
365
- setup: clean up setup_bare_git_dir()
366
- setup: limit get_git_work_tree()'s to explicit setup case only
367
- Use git_config_early() instead of git_config() during repo setup
@@ -173,114 +403,79 @@ even 'master' and have further polishing be done, if necessary, in-tree.
403
- Add t1510 and basic rules that run repo setup
404
- builtins: print setup info if repo is found
405
406
+I have to queue a handful of fixups still in flight.
407
+
408
* rr/needs-clean-work-tree (2010-10-19) 1 commit
177
- - Porcelain scripts: Rewrite cryptic "needs update" error message
409
+ (merged to 'next' on 2010-11-17 at b8aee21)
410
+ + Porcelain scripts: Rewrite cryptic "needs update" error message
411
179
-Looked Ok, will merge to 'next' soonish.
412
+Will merge to master soonish.
413
414
* sn/diff-doc (2010-11-04) 3 commits
415
- docs: clarify git diff modes of operation
416
- diff,difftool: Don't use the {0,2} notation in usage strings
417
- CodingGuidelines: Add a section on writing documentation
418
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...
419
+Will merge to next.
420
421
* 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
422
+ (merged to 'next' on 2010-11-15 at 9b8c830)
423
+ + rebase: teach --autosquash to match on sha1 in addition to message
424
+ + rebase: better rearranging of fixup!/squash! lines with --autosquash
425
+
426
+Will merge to master soonish.
427
428
* kb/maint-status-cquote (2010-11-08) 1 commit
429
- status: Quote paths with spaces in short format
430
199
-* mg/maint-tag-rfc1991 (2010-11-06) 5 commits
431
+Will merge to next.
432
+
433
+* mg/maint-tag-rfc1991 (2010-11-10) 5 commits
434
- tag: recognize rfc1991 signatures
435
- tag: factor out sig detection for tag display
436
- tag: factor out sig detection for body edits
437
- verify-tag: factor out signature detection
438
- t/t7004-tag: test handling of rfc1991 signatures
439
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
440
+Will merge to next.
441
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
442
+* ao/send-email-irt (2010-11-12) 2 commits
443
+ (merged to 'next' on 2010-11-15 at 257c77a)
444
+ + git-send-email.perl: make initial In-Reply-To apply only to first email
445
(merged to 'next' on 2010-11-08 at d103166)
446
+ t9001: send-email interation with --in-reply-to and --chain-reply-to
447
250
-* bg/maint-gitweb-test-lib (2010-10-20) 1 commit
251
- (merged to 'next' on 2010-11-05 at 0ead869)
252
- + t/gitweb-lib: Don't pass constant to decode_utf8
448
+Will merge to master soonish.
449
450
* cm/diff-check-at-eol (2010-10-10) 1 commit
255
- - diff --check: correct line numbers of new blank lines at EOF
256
-
257
-Looked Ok; will merge to 'next' soonish.
451
+ (merged to 'next' on 2010-11-17 at ad7005a)
452
+ + diff --check: correct line numbers of new blank lines at EOF
453
454
* fc/apply-p2-get-header-name (2010-10-21) 2 commits
260
- - test: git-apply -p2 rename/chmod only
261
- - Fix git-apply with -p greater than 1
455
+ (merged to 'next' on 2010-11-17 at 05a8e94)
456
+ + test: git-apply -p2 rename/chmod only
457
+ + Fix git-apply with -p greater than 1
458
263
-Looked Ok; will merge to 'next' soonish.
264
-
265
-* jk/add-e-doc (2010-10-21) 1 commit
459
+* jk/add-e-doc (2010-11-08) 2 commits
460
+ (merged to 'next' on 2010-11-15 at e971401)
461
+ + docs: give more hints about how "add -e" works
462
(merged to 'next' on 2010-11-05 at 389fee7)
463
+ docs: give more hints about how "add -e" works
464
465
+Will merge to master soonish.
466
+
467
* jk/diff-CBM (2010-10-21) 1 commit
468
(merged to 'next' on 2010-11-05 at 9d1ec14)
469
+ diff: report bogus input to -C/-M/-B
470
273
-* jk/missing-config (2010-10-21) 1 commit
274
- (merged to 'next' on 2010-11-05 at 31fda69)
275
- + config: treat non-existent config files as empty
471
+Will merge to master soonish.
472
473
* jn/fast-import-fix (2010-10-20) 4 commits
278
- - fast-import: do not clear notes in do_change_note_fanout()
279
- - t9300 (fast-import): another test for the "replace root" feature
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.
474
+ (merged to 'next' on 2010-11-17 at ef3b791)
475
+ + fast-import: do not clear notes in do_change_note_fanout()
476
+ + t9300 (fast-import): another test for the "replace root" feature
477
+ + fast-import: tighten M 040000 syntax
478
+ + fast-import: filemodify after M 040000 <tree> "" crashes
479
480
* jn/git-cmd-h-bypass-setup (2010-10-22) 7 commits
481
- update-index -h: show usage even with corrupt index
@@ -292,38 +487,19 @@ Looked Ok; will merge to 'next' soonish.
487
- branch -h: show usage even in an invalid repository
488
(this branch uses en/and-cascade-tests.)
489
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
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
490
+Will merge to next.
491
305
-* mg/make-prove (2010-10-14) 1 commit
306
- (merged to 'next' on 2010-11-05 at ec4f806)
307
- + test: allow running the tests under "prove"
492
+* kb/blame-author-email (2010-10-15) 1 commit
493
+ (merged to 'next' on 2010-11-17 at 6fd6a2f)
494
+ + blame: Add option to show author email instead of name
495
496
* 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.
497
+ (merged to 'next' on 2010-11-17 at b57a6cb)
498
+ + diff: don't presume empty file when corresponding object is missing
499
500
* 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
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
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
501
+ (merged to 'next' on 2010-11-17 at 69a9f46)
502
+ + make pack-objects a bit more resilient to repo corruption
503
504
* yd/dir-rename (2010-10-29) 5 commits
505
- Allow hiding renames of individual files involved in a directory rename.
@@ -332,13 +508,11 @@ Looked Ok; will merge to 'next' soonish.
508
- Raw diff output format for bulk moves.
509
- Introduce bulk-move detection in diffcore.
510
335
-* cb/diff-fname-optim (2010-09-26) 3 commits
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
511
+Yet to be rerolled.
512
341
-* en/merge-recursive (2010-10-21) 39 commits
513
+* en/merge-recursive (2010-11-08) 40 commits
514
+ (merged to 'next' on 2010-11-17 at 1b6f865)
515
+ + t6022: Use -eq not = to test output of wc -l
516
(merged to 'next' on 2010-11-05 at 16902eb)
517
+ merge-recursive:make_room_for_directories - work around dumb compilers
518
+ merge-recursive: Remove redundant path clearing for D/F conflicts
@@ -387,24 +561,14 @@ Looked Ok; will merge to 'next' soonish.
561
+ git-remote-fd
562
+ Add bidirectional_transfer_loop()
563
390
-* jn/gitweb-test (2010-09-26) 4 commits
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
404
- (merged to 'next' on 2010-11-05 at 5a2f940)
405
- + submodule sync: Update "submodule.<name>.url" for empty directories
564
+* ak/apply-non-git-epoch (2010-09-29) 2 commits
565
+ (merged to 'next' on 2010-11-17 at a00579c)
566
+ + apply: handle patches with funny filename and colon in timezone
567
+ + apply: Recognize epoch timestamps with : in the timezone
568
407
-* cb/leading-path-removal (2010-10-09) 5 commits
569
+* cb/leading-path-removal (2010-11-15) 6 commits
570
+ (merged to 'next' on 2010-11-17 at ec7d709)
571
+ + use persistent memory for rejected paths
572
(merged to 'next' on 2010-11-05 at 55ea322)
573
+ do not overwrite files in leading path
574
+ lstat_cache: optionally return match_len
@@ -412,9 +576,7 @@ Looked Ok; will merge to 'next' soonish.
576
+ t7607: add leading-path tests
577
+ t7607: use test-lib functions and check MERGE_HEAD
578
415
-* jh/notes-merge (2010-10-29) 25 commits
416
- - portability fix for c8af1a3b2f
417
- - notes-merge series: fixup minor style issues
579
+* jh/notes-merge (2010-11-09) 23 commits
580
- Provide 'git merge --abort' as a synonym to 'git reset --merge'
581
- cmd_merge(): Parse options before checking MERGE_HEAD
582
- Provide 'git notes get-ref' to easily retrieve current notes ref
@@ -439,36 +601,7 @@ Looked Ok; will merge to 'next' soonish.
601
- (trivial) notes.h: Minor documentation fixes to copy_notes()
602
- notes.c: Hexify SHA1 in die() message from init_notes()
603
442
-Still in flux?
443
-
444
-* jk/maint-rev-list-nul (2010-10-07) 1 commit
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
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
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
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
470
- (merged to 'next' on 2010-11-05 at 6836d70)
471
- + completion: Support the DWIM mode for git checkout
604
+Rerolled; will merge to next.
605
606
* pn/commit-autosquash (2010-11-02) 6 commits
607
- add tests of commit --squash
@@ -478,18 +611,7 @@ Still in flux?
611
- pretty.c: teach format_commit_message() to reencode the output
612
- commit: helper methods to reduce redundant blocks of code
613
481
-* sg/bisect (2010-10-10) 3 commits
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
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'
614
+Will merge to next.
615
616
* jj/icase-directory (2010-10-03) 8 commits
617
- Support case folding in git fast-import when core.ignorecase=true
@@ -501,34 +623,37 @@ Still in flux?
623
- Makefile & configure: add a NO_FNMATCH_CASEFOLD flag
624
- Makefile & configure: add a NO_FNMATCH flag
625
504
-* en/and-cascade-tests (2010-10-03) 13 commits
505
- - Introduce sane_unset and use it to ensure proper && chaining
506
- - t7800 (difftool): add missing &&
507
- - t7601 (merge-pull-config): add missing &&
508
- - t7001 (mv): add missing &&
509
- - t6016 (rev-list-graph-simplify-history): add missing &&
510
- - t5602 (clone-remote-exec): add missing &&
511
- - t4026 (color): remove unneeded and unchained command
512
- - t4019 (diff-wserror): add lots of missing &&
513
- - t4202 (log): Replace '<git-command> || :' with test_might_fail
514
- - t4002 (diff-basic): use test_might_fail for commands that might fail
515
- - t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
516
- - t4017 (diff-retval): replace manual exit code check with test_expect_code
517
- - test-lib: make test_expect_code a test command
626
+Will merge to next.
627
+
628
+* en/and-cascade-tests (2010-10-31) 25 commits
629
+ (merged to 'next' on 2010-11-15 at d51ec77)
630
+ + t4124 (apply --whitespace): use test_might_fail
631
+ + t3404: do not use 'describe' to implement test_cmp_rev
632
+ + t3404 (rebase -i): introduce helper to check position of HEAD
633
+ + t3404 (rebase -i): move comment to description
634
+ + t3404 (rebase -i): unroll test_commit loops
635
+ + t3301 (notes): use test_expect_code for clarity
636
+ + t1400 (update-ref): use test_must_fail
637
+ + t1502 (rev-parse --parseopt): test exit code from "-h"
638
+ + t6022 (renaming merge): chain test commands with &&
639
+ + test-lib: introduce test_line_count to measure files
640
+ + tests: add missing &&, batch 2
641
+ + tests: add missing &&
642
+ + Introduce sane_unset and use it to ensure proper && chaining
643
+ + t7800 (difftool): add missing &&
644
+ + t7601 (merge-pull-config): add missing &&
645
+ + t7001 (mv): add missing &&
646
+ + t6016 (rev-list-graph-simplify-history): add missing &&
647
+ + t5602 (clone-remote-exec): add missing &&
648
+ + t4026 (color): remove unneeded and unchained command
649
+ + t4019 (diff-wserror): add lots of missing &&
650
+ + t4202 (log): Replace '<git-command> || :' with test_might_fail
651
+ + t4002 (diff-basic): use test_might_fail for commands that might fail
652
+ + t100[12] (read-tree-m-2way, read_tree_m_u_2way): add missing &&
653
+ + t4017 (diff-retval): replace manual exit code check with test_expect_code
654
+ + test-lib: make test_expect_code a test command
655
(this branch is used by jn/git-cmd-h-bypass-setup.)
656
520
-* jk/no-textconv-symlink (2010-09-21) 1 commit
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
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
-
657
* nd/struct-pathspec (2010-09-20) 5 commits
658
- ce_path_match: drop prefix matching in favor of match_pathspec
659
- Convert ce_path_match() to use struct pathspec
@@ -537,8 +662,8 @@ Still in flux?
662
- pathspec: mark wildcard pathspecs from the beginning
663
(this branch uses en/object-list-with-pathspec.)
664
540
-This is related to something I have long been wanting to see happen. Will
541
-give it another look and merge to 'next'.
665
+This is related to something I have long been wanting to see happen.
666
+Wait Nguyen for another round (2010-11-11).
667
668
* en/object-list-with-pathspec (2010-09-20) 8 commits
669
- Add testcases showing how pathspecs are handled with rev-list --objects
@@ -552,20 +677,18 @@ give it another look and merge to 'next'.
677
(this branch is used by nd/struct-pathspec.)
678
679
* 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.
680
+ (merged to 'next' on 2010-11-17 at 6478f7f)
681
+ + smart-http: Don't change POST to GET when following redirect
682
683
* en/rename-d-f (2010-09-08) 2 commits
684
+ merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
685
+ t3509: Add rename + D/F conflict testcase that recursive strategy fails
686
(this branch is used by en/merge-recursive.)
687
564
-* jl/fetch-submodule-recursive (2010-09-19) 4 commits
565
- - fetch: Get submodule paths from index and not from .gitmodules
566
- - fetch: Fix a bug swallowing the output of recursive submodule fetching
567
- - Submodules: Add the new "fetch" config option for fetch and pull
568
- - fetch/pull: Recursively fetch populated submodules
688
+* jl/fetch-submodule-recursive (2010-11-11) 3 commits
689
+ - Submodules: Add the "fetchRecurseSubmodules" config option
690
+ - Add the 'fetch.recurseSubmodules' config setting
691
+ - fetch/pull: Add the --recurse-submodules option
692
693
* tr/merge-unborn-clobber (2010-08-22) 1 commit
694
- Exhibit merge bug that clobbers index&WT
@@ -733,6 +856,7 @@ Will merge to 'next' to see what happens.
856
- tests: use test_cmp instead of piping to diff(1)
857
- t7004-tag.sh: re-arrange git tag comment for clarity
858
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.
859
+It is getting ridiculously painful to keep re-resolving the conflicts with
860
+other topics in flight, even with the help with rerere.
861
+
862
+Needs a bit more minor work to get the basic code structure right.