What's cooking (2011/03 #04)
Junio C Hamano committed
Mar 23, 2011 at 16:34 UTC
37b0f8876ea3bf73c987bf95fe8d9ea239bfbdbc
1 file changed
+172
-221
whats-cooking.txt
+172
-221
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2011, #03; Tue, 22)
3
-X-master-at: 5e839c8f6d5edfaf0d2250f3c9628a238e24c6be
4
-X-next-at: 18336960f038eb2d7d5eb883b2967c8e38bedc3e
2
+Subject: What's cooking in git.git (Mar 2011, #04; Wed, 23)
3
+X-master-at: cd3065f9e3c27594a91540e971d147f1acba89de
4
+X-next-at: 46300131fe1c0c8ebcb394416c551a5f8fa38342
5
6
-What's cooking in git.git (Mar 2011, #03; Tue, 22)
6
+What's cooking in git.git (Mar 2011, #04; Wed, 23)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -13,7 +13,7 @@ I notice that there are too many stalled topics, for which only the
13
"finishing touches" are the missing pieces. These new "features" and
14
"usability" that were discussed, tried, and then abandoned are things that
15
we survived without so far, so in that sense I do not see very strong need
16
-for me to step in and clean them up alone, shaving my beauty sleep time.
16
+for me to step in and clean them up alone, losing my beauty sleep time.
17
18
But it is a shame to see all the discussions and efforts go to waste when
19
we are this (shows the thumb and the index finger almost touching)
@@ -21,112 +21,75 @@ close. Discussing new features may be more fun, but please, people, let's
21
start wrapping things up for this cycle.
22
23
--------------------------------------------------
24
-[Graduated to "master"]
24
+[New Topics]
25
26
-* jc/maint-fetch-alt (2011-03-11) 2 commits
27
- (merged to 'next' on 2011-03-17 at c61ec4f)
28
- + fetch-pack: objects in our alternates are available to us
29
- + refs_from_alternate: helper to use refs from alternates
30
-
31
-* jc/maint-rev-list-culled-boundary (2011-03-14) 1 commit
32
- (merged to 'next' on 2011-03-17 at 001b546)
33
- + list-objects.c: don't add an unparsed NULL as a pending tree
34
-
35
-* jn/test-sanitize-git-env (2011-03-15) 5 commits
36
- (merged to 'next' on 2011-03-17 at 80a3678)
37
- + tests: scrub environment of GIT_* variables
38
- + config: drop support for GIT_CONFIG_NOGLOBAL
39
- + gitattributes: drop support for GIT_ATTR_NOGLOBAL
40
- + tests: suppress system gitattributes
41
- + tests: stop worrying about obsolete environment variables
42
-
43
-* js/maint-stash-index-copy (2011-03-16) 2 commits
44
- (merged to 'next' on 2011-03-17 at 9f74cc8)
45
- + stash: copy the index using --index-output instead of cp -p
46
- + stash: fix incorrect quoting in cleanup of temporary files
47
-
48
-* mg/doc-bisect-tweak-worktree (2011-03-15) 2 commits
49
- (merged to 'next' on 2011-03-17 at e0acf52)
50
- + git-bisect.txt: example for bisecting with hot-fix
51
- + git-bisect.txt: streamline run presentation
52
-
53
-* mg/rev-list-one-side-only (2011-03-10) 10 commits
54
- (merged to 'next' on 2011-03-10 at 2a69869)
55
- + git-log: put space after commit mark
56
- + t6007: test rev-list --cherry
57
- + log --cherry: a synonym
58
- + rev-list: documentation and test for --cherry-mark
59
- + revision.c: introduce --cherry-mark
60
- + rev-list/log: factor out revision mark generation
61
- + rev-list: --left/right-only are mutually exclusive
62
- + rev-list: documentation and test for --left/right-only
63
- + t6007: Make sure we test --cherry-pick
64
- + revlist.c: introduce --left/right-only for unsymmetric picking
65
- (this branch is used by mg/rev-list-n-parents.)
66
-
67
-* sg/complete-symmetric-diff (2011-03-10) 2 commits
68
- (merged to 'next' on 2011-03-17 at adb0618)
69
- + bash: complete 'git diff ...branc<TAB>'
70
- + bash: fix misindented esac statement in __git_complete_file()
71
-
72
-* sp/maint-fetch-pack-stop-early (2011-03-14) 2 commits
73
- (merged to 'next' on 2011-03-17 at 2580068)
74
- + fetch-pack: Implement no-done capability
75
- + fetch-pack: Finish negotation if remote replies "ACK %s ready"
76
- (this branch is used by jc/fetch-progressive-stride.)
77
-
78
-* sp/maint-upload-pack-stop-early (2011-03-14) 2 commits
79
- (merged to 'next' on 2011-03-17 at e717a84)
80
- + upload-pack: Implement no-done capability
81
- + upload-pack: More aggressively send 'ACK %s ready'
82
-
83
-* tl/p4 (2011-03-15) 3 commits
84
- (merged to 'next' on 2011-03-17 at 3d7f69f)
85
- + git-p4: Fix error message crash in P4Sync.commit.
86
- + Teach git-p4 to ignore case in perforce filenames if configured.
87
- + git-p4: Teach gitConfig method about arguments.
26
+* jc/diff-dotdot (2011-03-23) 2 commits
27
+ - warn use of "git diff A..B"
28
+ - diff: remove dead code that flips arguments order
29
89
---------------------------------------------------
90
-[New Topics]
30
+This is 1/4 tongue-in-cheek but mostly serious.
31
92
-* jc/add-u-migration (2011-03-22) 3 commits
93
- - add: make "add -u/-A" update full tree without pathspec (step 3)
94
- - add: make "add -u/-A" update full tree without pathspec (step 2)
95
- - add: make "add -u/-A" update full tree without pathspec
32
+* jk/progress-with-pager (2011-03-23) 3 commits
33
+ - show: turn on rename progress
34
+ - progress: use pager's original_stderr if available
35
+ - pager: save the original stderr when redirecting to pager
36
97
-The earlier one was a flawed migration path. We would probably need
98
-per-user preference after all.
37
+The bottom two feel like a right thing to do, but "show" may not be a
38
+right example.
39
100
-* jk/checkout-orphan-warning (2011-03-20) 3 commits
101
- - checkout: tweak detached-orphan warning format
102
- - checkout: clear commit marks after detached-orphan check
103
- - checkout: add basic tests for detached-orphan warning
40
+--------------------------------------------------
41
+[Graduated to "master"]
42
105
-Will merge to 'next'.
43
+* jc/maint-diff-q-filter (2011-03-16) 1 commit
44
+ (merged to 'next' on 2011-03-20 at d3d85dc)
45
+ + diff --quiet: disable optimization when --diff-filter=X is used
46
107
-* mg/rev-list-n-parents (2011-03-21) 3 commits
108
- - rev-list --min-parents,--max-parents: doc, test and completion
109
- - revision.c: introduce --min-parents and --max-parents options
110
- - t6009: use test_commit() from test-lib.sh
47
+* jn/fortify-source-workaround (2011-03-16) 1 commit
48
+ (merged to 'next' on 2011-03-20 at 69c4ceb)
49
+ + run-command: prettify -D_FORTIFY_SOURCE workaround
50
112
-Perhaps will wait until the "infinity" syntax settles.
51
+* jn/maint-c99-format (2011-03-16) 2 commits
52
+ (merged to 'next' on 2011-03-20 at 65cbc8c)
53
+ + unbreak and eliminate NO_C99_FORMAT
54
+ + mktag: avoid %td in format string
55
114
-* jc/index-update-if-able (2011-03-21) 2 commits
115
- - update $GIT_INDEX_FILE when there are racily clean entries
116
- - diff/status: refactor opportunistic index update
56
+* kc/gitweb-pathinfo-w-anchor (2011-03-18) 1 commit
57
+ (merged to 'next' on 2011-03-20 at 2d65786)
58
+ + gitweb: fix #patchNN anchors when path_info is enabled
59
118
-* jp/completion-help-alias (2011-03-21) 1 commit
119
- - git-completion: Add git help completion for aliases
60
+* lt/default-abbrev (2011-03-20) 2 commits
61
+ (merged to 'next' on 2011-03-20 at 17ed457)
62
+ + Rename core.abbrevlength back to core.abbrev
63
+ (merged to 'next' on 2011-03-17 at 1d7e406)
64
+ + Make the default abbrev length configurable
65
121
-* js/remove-unused-variables (2011-03-22) 1 commit
122
- - Remove unused variables
66
+The configuration roughly corresponds to --abbrev command line option, so
67
+I should rename it back to core.abbrev as Linus originally named it.
68
+Will merge to 'master'.
69
124
-* sb/sparse-more (2011-03-21) 1 commit
125
- - Makefile: Cover more files with make check
70
+* pk/stash-apply-status-relative (2011-03-14) 2 commits
71
+ (merged to 'next' on 2011-03-20 at 232b096)
72
+ + Add test: git stash shows status relative to current dir
73
+ + git stash: show status relative to current directory
74
+
75
+* pw/p4 (2011-03-16) 2 commits
76
+ (merged to 'next' on 2011-03-20 at fdad818)
77
+ + git-p4: test sync new branch
78
+ + git-p4: fix sync new branch regression
79
80
--------------------------------------------------
81
[Stalled]
82
83
+* jc/add-u-migration (2011-03-22) 3 commits
84
+ - add: make "add -u/-A" update full tree without pathspec (step 3)
85
+ - add: make "add -u/-A" update full tree without pathspec (step 2)
86
+ - add: make "add -u/-A" update full tree without pathspec
87
+
88
+The message in the bottom one really needs proofreading to move this topic
89
+forward. Of course, perhaps nobody cares enough (even though many people
90
+seem to have complained about the current behaviour) and we may end up
91
+discarding this topic. We'll see.
92
+
93
* jh/merge-sans-branch (2011-02-10) 4 commits
94
. merge: add support for merging from upstream by default
95
- merge: introduce per-branch-configuration helper function
@@ -222,13 +185,47 @@ current usage context.
185
Do not merge; it would be preferable to use ":/" or whatever magic
186
pathspec that is relative to the root of the working tree.
187
188
+--------------------------------------------------
189
+[Cooking]
190
+
191
* jc/maint-rerere-in-workdir (2011-03-10) 1 commit
226
- - rerere: make sure it works even in a workdir attached to a young repository
192
+ (merged to 'next' on 2011-03-23 at e5ef1a2)
193
+ + rerere: make sure it works even in a workdir attached to a young repository
194
228
-Do not merge; needs more thought around relative symlinks.
195
+Resurrected, as this was originally written with the explicit goal of
196
+helping contrib/workdir/git-new-workdir users, and it is good enough to
197
+only support absolute symbolic links for that purpose.
198
230
---------------------------------------------------
231
-[Cooking]
199
+* jk/checkout-orphan-warning (2011-03-20) 3 commits
200
+ (merged to 'next' on 2011-03-23 at 26adae6)
201
+ + checkout: tweak detached-orphan warning format
202
+ + checkout: clear commit marks after detached-orphan check
203
+ + checkout: add basic tests for detached-orphan warning
204
+
205
+* mg/rev-list-n-parents (2011-03-23) 3 commits
206
+ (merged to 'next' on 2011-03-23 at 8baa059)
207
+ + rev-list --min-parents,--max-parents: doc, test and completion
208
+ + revision.c: introduce --min-parents and --max-parents options
209
+ + t6009: use test_commit() from test-lib.sh
210
+
211
+Rerolled with --no-max-parents and the like.
212
+
213
+* jc/index-update-if-able (2011-03-21) 2 commits
214
+ (merged to 'next' on 2011-03-23 at e7e071a)
215
+ + update $GIT_INDEX_FILE when there are racily clean entries
216
+ + diff/status: refactor opportunistic index update
217
+
218
+* jp/completion-help-alias (2011-03-21) 1 commit
219
+ (merged to 'next' on 2011-03-23 at e21fa7b)
220
+ + git-completion: Add git help completion for aliases
221
+
222
+* js/remove-unused-variables (2011-03-22) 1 commit
223
+ (merged to 'next' on 2011-03-23 at 4630013)
224
+ + Remove unused variables
225
+
226
+* sb/sparse-more (2011-03-21) 1 commit
227
+ (merged to 'next' on 2011-03-23 at 4bec1d1)
228
+ + Makefile: Cover more files with make check
229
230
* jc/rename-degrade-cc-to-c (2011-01-06) 4 commits
231
- diffcore-rename: fall back to -C when -C -C busts the rename limit
@@ -242,23 +239,6 @@ rebasing on bf0ab10 (merge: improve inexact rename limit warning,
239
warning outside merge-recursive codepath. The top one ended up
240
larger than it should have been as a result.
241
245
-* lt/default-abbrev (2011-03-20) 2 commits
246
- (merged to 'next' on 2011-03-20 at 17ed457)
247
- + Rename core.abbrevlength back to core.abbrev
248
- (merged to 'next' on 2011-03-17 at 1d7e406)
249
- + Make the default abbrev length configurable
250
-
251
-The configuration roughly corresponds to --abbrev command line option, so
252
-I should rename it back to core.abbrev as Linus originally named it.
253
-Will merge to 'master'.
254
-
255
-* pk/stash-apply-status-relative (2011-03-14) 2 commits
256
- (merged to 'next' on 2011-03-20 at 232b096)
257
- + Add test: git stash shows status relative to current dir
258
- + git stash: show status relative to current directory
259
-
260
-Will merge to 'master'.
261
-
242
* cn/system-path-tweak (2011-03-17) 1 commit
243
- system_path: use a static buffer
244
@@ -268,28 +248,6 @@ Will merge to 'master'.
248
+ fetch-pack: progressively use larger handshake windows
249
+ fetch-pack: factor out hardcoded handshake window size
250
271
-* jc/maint-diff-q-filter (2011-03-16) 1 commit
272
- (merged to 'next' on 2011-03-20 at d3d85dc)
273
- + diff --quiet: disable optimization when --diff-filter=X is used
274
-
275
-* jn/fortify-source-workaround (2011-03-16) 1 commit
276
- (merged to 'next' on 2011-03-20 at 69c4ceb)
277
- + run-command: prettify -D_FORTIFY_SOURCE workaround
278
-
279
-* jn/maint-c99-format (2011-03-16) 2 commits
280
- (merged to 'next' on 2011-03-20 at 65cbc8c)
281
- + unbreak and eliminate NO_C99_FORMAT
282
- + mktag: avoid %td in format string
283
-
284
-* kc/gitweb-pathinfo-w-anchor (2011-03-18) 1 commit
285
- (merged to 'next' on 2011-03-20 at 2d65786)
286
- + gitweb: fix #patchNN anchors when path_info is enabled
287
-
288
-* pw/p4 (2011-03-16) 2 commits
289
- (merged to 'next' on 2011-03-20 at fdad818)
290
- + git-p4: test sync new branch
291
- + git-p4: fix sync new branch regression
292
-
251
* en/merge-recursive (2011-03-17) 4 commits
252
(merged to 'next' on 2011-03-18 at a32016b)
253
+ merge-recursive: tweak magic band-aid
@@ -322,88 +280,81 @@ I am not happy with these magic band aids.
280
The CLI side (ss/mergetool--lib topic) will be in the next release, so
281
I've pinged Pat to take this into gut-gui tree.
282
325
-* nd/index-doc (2010-09-06) 1 commit
326
- - doc: technical details about the index file format
327
-
328
-Will merge to 'next'.
283
+* nd/index-doc (2011-03-01) 2 commits
284
+ (merged to 'next' on 2011-03-23 at 316cafc)
285
+ + doc: technical details about the index file format
286
+ + doc: technical details about the index file format
287
288
* ab/i18n-st (2011-02-22) 69 commits
331
- - i18n: git-shortlog basic messages
332
- - i18n: git-revert split up "could not revert/apply" message
333
- - i18n: git-revert literal "me" messages
334
- - i18n: git-revert "Your local changes" message
335
- - i18n: git-revert basic messages
336
- - i18n: git-notes GIT_NOTES_REWRITE_MODE error message
337
- - i18n: git-notes basic commands
338
- - i18n: git-gc "Auto packing the repository" message
339
- - i18n: git-gc basic messages
340
- - i18n: git-describe basic messages
341
- - i18n: git-clean clean.requireForce messages
342
- - i18n: git-clean basic messages
343
- - i18n: git-bundle basic messages
344
- - i18n: git-archive basic messages
345
- - i18n: git-status "renamed: " message
346
- - i18n: git-status "Initial commit" message
347
- - i18n: git-status "Changes to be committed" message
348
- - i18n: git-status shortstatus messages
349
- - i18n: git-status "nothing to commit" messages
350
- - i18n: git-status basic messages
351
- - i18n: git-push "prevent you from losing" message
352
- - i18n: git-push basic messages
353
- - i18n: git-tag tag_template message
354
- - i18n: git-tag basic messages
355
- - i18n: git-reset "Unstaged changes after reset" message
356
- - i18n: git-reset reset_type_names messages
357
- - i18n: git-reset basic messages
358
- - i18n: git-rm basic messages
359
- - i18n: git-mv "bad" messages
360
- - i18n: git-mv basic messages
361
- - i18n: git-merge "Wonderful" message
362
- - i18n: git-merge "You have not concluded your merge" messages
363
- - i18n: git-merge "Updating %s..%s" message
364
- - i18n: git-merge basic messages
365
- - i18n: git-log "--OPT does not make sense" messages
366
- - i18n: git-log basic messages
367
- - i18n: git-grep "--open-files-in-pager" message
368
- - i18n: git-grep basic messages
369
- - i18n: git-fetch split up "(non-fast-forward)" message
370
- - i18n: git-fetch update_local_ref messages
371
- - i18n: git-fetch formatting messages
372
- - i18n: git-fetch basic messages
373
- - i18n: git-diff basic messages
374
- - i18n: git-commit advice messages
375
- - i18n: git-commit "enter the commit message" message
376
- - i18n: git-commit print_summary messages
377
- - i18n: git-commit formatting messages
378
- - i18n: git-commit "middle of a merge" message
379
- - i18n: git-commit basic messages
380
- - i18n: git-checkout "Switched to a .. branch" message
381
- - i18n: git-checkout "HEAD is now at" message
382
- - i18n: git-checkout describe_detached_head messages
383
- - i18n: git-checkout: our/their version message
384
- - i18n: git-checkout basic messages
385
- - i18n: git-branch "(no branch)" message
386
- - i18n: git-branch "git branch -v" messages
387
- - i18n: git-branch "Deleted branch [...]" message
388
- - i18n: git-branch "remote branch '%s' not found" message
389
- - i18n: git-branch basic messages
390
- - i18n: git-add "Unstaged changes" message
391
- - i18n: git-add "remove '%s'" message
392
- - i18n: git-add "did not match any files" message
393
- - i18n: git-add "The following paths are ignored" message
394
- - i18n: git-add basic messages
395
- - i18n: git-clone "Cloning into" message
396
- - i18n: git-clone "Cloning into" message
397
- - i18n: git-clone basic messages
398
- - i18n: git-init "Initialized [...] repository" message
399
- - i18n: git-init basic messages
400
-
401
---------------------------------------------------
402
-[Discarded]
403
-
404
-* nd/rfc-add-u-full-tree (2011-02-07) 1 commit
405
- - add: make "add -u" update full tree without pathspec
406
-
407
-See jc/add-u-migration.
408
-
409
-
289
+ (merged to 'next' on 2011-03-23 at e2732e2)
290
+ + i18n: git-shortlog basic messages
291
+ + i18n: git-revert split up "could not revert/apply" message
292
+ + i18n: git-revert literal "me" messages
293
+ + i18n: git-revert "Your local changes" message
294
+ + i18n: git-revert basic messages
295
+ + i18n: git-notes GIT_NOTES_REWRITE_MODE error message
296
+ + i18n: git-notes basic commands
297
+ + i18n: git-gc "Auto packing the repository" message
298
+ + i18n: git-gc basic messages
299
+ + i18n: git-describe basic messages
300
+ + i18n: git-clean clean.requireForce messages
301
+ + i18n: git-clean basic messages
302
+ + i18n: git-bundle basic messages
303
+ + i18n: git-archive basic messages
304
+ + i18n: git-status "renamed: " message
305
+ + i18n: git-status "Initial commit" message
306
+ + i18n: git-status "Changes to be committed" message
307
+ + i18n: git-status shortstatus messages
308
+ + i18n: git-status "nothing to commit" messages
309
+ + i18n: git-status basic messages
310
+ + i18n: git-push "prevent you from losing" message
311
+ + i18n: git-push basic messages
312
+ + i18n: git-tag tag_template message
313
+ + i18n: git-tag basic messages
314
+ + i18n: git-reset "Unstaged changes after reset" message
315
+ + i18n: git-reset reset_type_names messages
316
+ + i18n: git-reset basic messages
317
+ + i18n: git-rm basic messages
318
+ + i18n: git-mv "bad" messages
319
+ + i18n: git-mv basic messages
320
+ + i18n: git-merge "Wonderful" message
321
+ + i18n: git-merge "You have not concluded your merge" messages
322
+ + i18n: git-merge "Updating %s..%s" message
323
+ + i18n: git-merge basic messages
324
+ + i18n: git-log "--OPT does not make sense" messages
325
+ + i18n: git-log basic messages
326
+ + i18n: git-grep "--open-files-in-pager" message
327
+ + i18n: git-grep basic messages
328
+ + i18n: git-fetch split up "(non-fast-forward)" message
329
+ + i18n: git-fetch update_local_ref messages
330
+ + i18n: git-fetch formatting messages
331
+ + i18n: git-fetch basic messages
332
+ + i18n: git-diff basic messages
333
+ + i18n: git-commit advice messages
334
+ + i18n: git-commit "enter the commit message" message
335
+ + i18n: git-commit print_summary messages
336
+ + i18n: git-commit formatting messages
337
+ + i18n: git-commit "middle of a merge" message
338
+ + i18n: git-commit basic messages
339
+ + i18n: git-checkout "Switched to a .. branch" message
340
+ + i18n: git-checkout "HEAD is now at" message
341
+ + i18n: git-checkout describe_detached_head messages
342
+ + i18n: git-checkout: our/their version message
343
+ + i18n: git-checkout basic messages
344
+ + i18n: git-branch "(no branch)" message
345
+ + i18n: git-branch "git branch -v" messages
346
+ + i18n: git-branch "Deleted branch [...]" message
347
+ + i18n: git-branch "remote branch '%s' not found" message
348
+ + i18n: git-branch basic messages
349
+ + i18n: git-add "Unstaged changes" message
350
+ + i18n: git-add "remove '%s'" message
351
+ + i18n: git-add "did not match any files" message
352
+ + i18n: git-add "The following paths are ignored" message
353
+ + i18n: git-add basic messages
354
+ + i18n: git-clone "Cloning into" message
355
+ + i18n: git-clone "Cloning into" message
356
+ + i18n: git-clone basic messages
357
+ + i18n: git-init "Initialized [...] repository" message
358
+ + i18n: git-init basic messages
359
+
360
+Now in 'next'.