What's cooking (2011/03 #05)
Junio C Hamano committed
Mar 27, 2011 at 00:44 UTC
87dd515b71ad8ee566c8af79a5e35461bd80ad2c
1 file changed
+101
-123
whats-cooking.txt
+101
-123
@@ -1,104 +1,103 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2011, #04; Wed, 23)
3
-X-master-at: cd3065f9e3c27594a91540e971d147f1acba89de
4
-X-next-at: 46300131fe1c0c8ebcb394416c551a5f8fa38342
2
+Subject: What's cooking in git.git (Mar 2011, #05; Sun, 27)
3
+X-master-at: be919d50c08fbe3a0653d6ba778b73f4940705ca
4
+X-next-at: be8b495e51e5bd78849a4c79633fcb93d3959a48
5
6
-What's cooking in git.git (Mar 2011, #04; Wed, 23)
6
+What's cooking in git.git (Mar 2011, #05; Sun, 27)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' while commits prefixed with '+' are in 'next'.
11
12
-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, 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)
20
-close. Discussing new features may be more fun, but please, people, let's
21
-start wrapping things up for this cycle.
22
-
12
--------------------------------------------------
13
[New Topics]
14
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
15
+* jc/merge-sans-branch (2011-03-23) 2 commits
16
+ - merge: merge with the default upstream branch without argument
17
+ - merge: match the help text with the documentation
18
30
-This is 1/4 tongue-in-cheek but mostly serious.
19
+Allow running "git merge" without telling it what to merge. It will merge
20
+with the "upstream" of the current branch if configured.
21
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
22
+* jh/gitweb-localtime (2011-03-23) 1 commit
23
+ - gitweb: javascript ability to adjust time based on timezone
24
37
-The bottom two feel like a right thing to do, but "show" may not be a
38
-right example.
25
+* jk/maint-merge-rename-create (2011-03-25) 3 commits
26
+ - merge: turn on rewrite detection
27
+ - merge: handle renames with replacement content
28
+ - t3030: fix accidental success in symlink rename
29
+
30
+* jk/pull-into-empty (2011-03-25) 2 commits
31
+ - pull: do not clobber untracked files on initial pull
32
+ - merge: merge unborn index before setting ref
33
+
34
+* mz/maint-rename-unmerged (2011-03-23) 1 commit
35
+ - diffcore-rename: don't consider unmerged path as source
36
+
37
+* nd/struct-pathspec (2011-03-25) 4 commits
38
+ - Improve tree_entry_interesting() handling code
39
+ - Convert read_tree{,_recursive} to support struct pathspec
40
+ - Reimplement read_tree_recursive() using tree_entry_interesting()
41
+ - Merge branch 'en/object-list-with-pathspec' into 'nd/struct-pathspec'
42
43
--------------------------------------------------
44
[Graduated to "master"]
45
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
+* jc/fetch-progressive-stride (2011-03-20) 3 commits
47
+ (merged to 'next' on 2011-03-20 at 2917b19)
48
+ + fetch-pack: use smaller handshake window for initial request
49
+ + fetch-pack: progressively use larger handshake windows
50
+ + fetch-pack: factor out hardcoded handshake window size
51
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
52
+* jc/index-update-if-able (2011-03-21) 2 commits
53
+ (merged to 'next' on 2011-03-23 at e7e071a)
54
+ + update $GIT_INDEX_FILE when there are racily clean entries
55
+ + diff/status: refactor opportunistic index update
56
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
57
+* jc/maint-rerere-in-workdir (2011-03-10) 1 commit
58
+ (merged to 'next' on 2011-03-23 at e5ef1a2)
59
+ + rerere: make sure it works even in a workdir attached to a young repository
60
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
61
+Resurrected, as this was originally written with the explicit goal of
62
+helping contrib/workdir/git-new-workdir users, and it is good enough to
63
+only support absolute symbolic links for that purpose.
64
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
+* jk/checkout-orphan-warning (2011-03-20) 3 commits
66
+ (merged to 'next' on 2011-03-23 at 26adae6)
67
+ + checkout: tweak detached-orphan warning format
68
+ + checkout: clear commit marks after detached-orphan check
69
+ + checkout: add basic tests for detached-orphan warning
70
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'.
71
+* jp/completion-help-alias (2011-03-21) 1 commit
72
+ (merged to 'next' on 2011-03-23 at e21fa7b)
73
+ + git-completion: Add git help completion for aliases
74
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
75
+* js/remove-unused-variables (2011-03-22) 1 commit
76
+ (merged to 'next' on 2011-03-23 at 4630013)
77
+ + Remove unused variables
78
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
+* mg/rev-list-n-parents (2011-03-23) 3 commits
80
+ (merged to 'next' on 2011-03-23 at 8baa059)
81
+ + rev-list --min-parents,--max-parents: doc, test and completion
82
+ + revision.c: introduce --min-parents and --max-parents options
83
+ + t6009: use test_commit() from test-lib.sh
84
80
---------------------------------------------------
81
-[Stalled]
85
+Rerolled with --no-max-parents and the like.
86
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
+* nd/index-doc (2011-03-01) 2 commits
88
+ (merged to 'next' on 2011-03-23 at 316cafc)
89
+ + doc: technical details about the index file format
90
+ + doc: technical details about the index file format
91
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
+* ss/git-gui-mergetool (2011-02-26) 2 commits
93
+ (merged to 'next' on 2011-03-17 at a8fac18)
94
+ + mergetool--lib: Add Beyond Compare 3 as a tool
95
+ + mergetool--lib: Sort tools alphabetically for easier lookup
96
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
96
- - merge: introduce setup_merge_commit helper function
97
- - merge: update the usage information to be more modern
97
+Merged through Pat's git-gui tree.
98
99
-There was an objection to the tip one that determines the upstream in a
100
-wrong way? I've been wanting to move this forward for quite some time but
101
-also hoping somebody else would send in a final version.
99
+--------------------------------------------------
100
+[Stalled]
101
102
* mz/rebase (2011-02-28) 34 commits
103
- rebase: define options in OPTIONS_SPEC
@@ -188,40 +187,19 @@ pathspec that is relative to the root of the working tree.
187
--------------------------------------------------
188
[Cooking]
189
191
-* jc/maint-rerere-in-workdir (2011-03-10) 1 commit
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
-
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
-
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
190
+* jc/add-u-migration (2011-03-22) 3 commits
191
+ - add: make "add -u/-A" update full tree without pathspec (step 3)
192
+ - add: make "add -u/-A" update full tree without pathspec (step 2)
193
+ - add: make "add -u/-A" update full tree without pathspec
194
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
195
+The message in the bottom one really needs proofreading to move this topic
196
+forward. Will merge to 'next' the bottom one, hopefully after that.
197
222
-* js/remove-unused-variables (2011-03-22) 1 commit
223
- (merged to 'next' on 2011-03-23 at 4630013)
224
- + Remove unused variables
198
+* jk/progress-with-pager (2011-03-24) 4 commits
199
+ - diff: turn on rename detection progress reporting
200
+ - show: turn on rename detection progress reporting
201
+ - progress: use pager's original_stderr if available
202
+ - pager: save the original stderr when redirecting to pager
203
204
* sb/sparse-more (2011-03-21) 1 commit
205
(merged to 'next' on 2011-03-23 at 4bec1d1)
@@ -242,12 +220,6 @@ larger than it should have been as a result.
220
* cn/system-path-tweak (2011-03-17) 1 commit
221
- system_path: use a static buffer
222
245
-* jc/fetch-progressive-stride (2011-03-20) 3 commits
246
- (merged to 'next' on 2011-03-20 at 2917b19)
247
- + fetch-pack: use smaller handshake window for initial request
248
- + fetch-pack: progressively use larger handshake windows
249
- + fetch-pack: factor out hardcoded handshake window size
250
-
223
* en/merge-recursive (2011-03-17) 4 commits
224
(merged to 'next' on 2011-03-18 at a32016b)
225
+ merge-recursive: tweak magic band-aid
@@ -272,19 +244,6 @@ I am not happy with these magic band aids.
244
+ fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
245
+ fetch/pull: recurse into submodules when necessary
246
275
-* ss/git-gui-mergetool (2011-02-26) 2 commits
276
- (merged to 'next' on 2011-03-17 at a8fac18)
277
- + mergetool--lib: Add Beyond Compare 3 as a tool
278
- + mergetool--lib: Sort tools alphabetically for easier lookup
279
-
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
-
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
-
247
* ab/i18n-st (2011-02-22) 69 commits
248
(merged to 'next' on 2011-03-23 at e2732e2)
249
+ i18n: git-shortlog basic messages
@@ -358,3 +317,22 @@ I've pinged Pat to take this into gut-gui tree.
317
+ i18n: git-init basic messages
318
319
Now in 'next'.
320
+
321
+--------------------------------------------------
322
+[Discarded]
323
+
324
+* jc/diff-dotdot (2011-03-23) 2 commits
325
+ . warn use of "git diff A..B"
326
+ . diff: remove dead code that flips arguments order
327
+
328
+This is 1/4 tongue-in-cheek. Now we seem to have at least two volunteer
329
+cluebat bearers, so I wouldn't have to worry about this topic very much.
330
+
331
+* jh/merge-sans-branch (2011-02-10) 4 commits
332
+ . merge: add support for merging from upstream by default
333
+ - merge: introduce per-branch-configuration helper function
334
+ - merge: introduce setup_merge_commit helper function
335
+ - merge: update the usage information to be more modern
336
+
337
+I've been wanting to move this forward for quite some time but
338
+ended up redoing it myself (see jc/merge-sans-branch)