What's cooking (2012/01 #08)
Junio C Hamano committed
Jan 31, 2012 at 23:13 UTC
15445e7cc97a5a291402b0c9a8e72024530b7754
1 file changed
+142
-213
whats-cooking.txt
+142
-213
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jan 2012, #07; Sun, 29)
3
-X-master-at: 85da4d459bd6fe11189a2ccf560c952b31ed67b2
4
-X-next-at: 001a395be8dff147088b94dda0892c87a949c033
2
+Subject: What's cooking in git.git (Jan 2012, #08; Tue, 31)
3
+X-master-at: 2a2aa8e5561d4cfc00c8e021b1231958f6d4d2fa
4
+X-next-at: a0195c8c59b10d7dd4bf7ef9fcfd8e43f04a6777
5
6
-What's cooking in git.git (Jan 2012, #07; Sun, 29)
6
+What's cooking in git.git (Jan 2012, #08; Tue, 31)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -43,95 +43,132 @@ The preformatted documentation in HTML and man format are found in:
43
--------------------------------------------------
44
[New Topics]
45
46
-* bl/gitweb-project-filter (2012-01-29) 2 commits
47
- - gitweb: place links to parent directories in page header
48
- - gitweb: add project_filter to limit project list to a subdirectory
46
+* fc/zsh-completion (2012-01-30) 4 commits
47
+ - (squash to previous?) completion: remove unused code
48
+ - completion: simplify __git_remotes
49
+ - (squash) completion-style
50
+ - completion: be nicer with zsh
51
50
-* rt/completion-branch-edit-desc (2012-01-29) 1 commit
51
- - completion: --edit-description option for git-branch
52
+Somehow only 2 out of 4-part series seem to have reached the list, missing
53
+the other 2.
54
+
55
+* jc/maint-request-pull-for-tag (2012-01-31) 1 commit
56
+ - request-pull: explicitly ask tags/$name to be pulled
57
+
58
+Usability improvement.
59
+Will merge to 'next'.
60
+
61
+* nd/find-pack-entry-recent-cache-invalidation (2012-01-31) 1 commit
62
+ - find_pack_entry(): do not keep packed_git pointer locally
63
+
64
+Review comments sent.
65
+
66
+* nd/pack-objects-parseopt (2012-01-31) 1 commit
67
+ - pack-objects: convert to use parse_options()
68
+
69
+Review comments sent.
70
+
71
+* tr/merge-edit-guidance (2012-01-31) 1 commit
72
+ (merged to 'next' on 2012-01-31 at bb678f7)
73
+ + merge: add instructions to the commit message when editing
74
+
75
+Will merge to 'master' in the second batch.
76
77
--------------------------------------------------
78
[Graduated to "master"]
79
56
-* cb/git-daemon-tests (2012-01-08) 5 commits
57
- (merged to 'next' on 2012-01-08 at 1db8351)
58
- + git-daemon tests: wait until daemon is ready
59
- + git-daemon: produce output when ready
60
- + git-daemon: add tests
61
- + dashed externals: kill children on exit
62
- + run-command: optionally kill children on exit
63
-
64
-* cb/push-quiet (2012-01-08) 3 commits
65
- (merged to 'next' on 2012-01-20 at 4326dda)
66
- + t5541: avoid TAP test miscounting
67
- + fix push --quiet: add 'quiet' capability to receive-pack
68
- + server_supports(): parse feature list more carefully
69
-
70
-* jc/maint-log-first-parent-pathspec (2012-01-19) 1 commit
71
- (merged to 'next' on 2012-01-20 at fb2b35f)
72
- + Making pathspec limited log play nicer with --first-parent
73
-
74
-* jk/parse-object-cached (2012-01-06) 3 commits
75
- (merged to 'next' on 2012-01-08 at 8c6fa4a)
76
- + upload-pack: avoid parsing tag destinations
77
- + upload-pack: avoid parsing objects during ref advertisement
78
- + parse_object: try internal cache before reading object db
79
-
80
-These are a bit scary changes, but I do think they are worth doing.
81
-
82
-* jl/test-pause (2012-01-17) 1 commit
83
- (merged to 'next' on 2012-01-20 at ee56335)
84
- + test-lib: add the test_pause convenience function
85
-
86
-* jn/gitweb-unspecified-action (2012-01-09) 1 commit
87
- (merged to 'next' on 2012-01-20 at 2b31714)
88
- + gitweb: Fix actionless dispatch for non-existent objects
89
-
90
-* mh/ref-clone-without-extra-refs (2012-01-17) 4 commits
91
- (merged to 'next' on 2012-01-20 at 2e9645e)
92
- + write_remote_refs(): create packed (rather than extra) refs
93
- + add_packed_ref(): new function in the refs API.
94
- + ref_array: keep track of whether references are sorted
95
- + pack_refs(): remove redundant check
96
-
97
-Looked reasonable; will hopefully help making mh/ref-api-rest simpler and
98
-cleaner.
99
-
100
-* nd/clone-single-branch (2012-01-08) 1 commit
101
- (merged to 'next' on 2012-01-09 at 6c3c759)
102
- + clone: add --single-branch to fetch only one branch
103
- (this branch is used by nd/clone-detached.)
104
-
105
-* nd/index-pack-no-recurse (2012-01-16) 3 commits
106
- (merged to 'next' on 2012-01-20 at d1e964e)
107
- + index-pack: eliminate unlimited recursion in get_base_data()
108
- + index-pack: eliminate recursion in find_unresolved_deltas
109
- + Eliminate recursion in setting/clearing marks in commit list
110
-
111
-* nd/maint-refname-in-hierarchy-check (2012-01-11) 1 commit
112
- (merged to 'next' on 2012-01-20 at acb5611)
113
- + Fix incorrect ref namespace check
114
-
115
-* pw/p4-view-updates (2012-01-11) 5 commits
116
- (merged to 'next' on 2012-01-20 at 8ca2c7b)
117
- + git-p4: add tests demonstrating spec overlay ambiguities
118
- + git-p4: adjust test to adhere to stricter useClientSpec
119
- + git-p4: clarify comment
120
- + git-p4: fix verbose comment typo
121
- + git-p4: only a single ... wildcard is supported
122
-
123
-* rs/diff-postimage-in-context (2012-01-06) 1 commit
124
- (merged to 'next' on 2012-01-09 at 9635032)
125
- + xdiff: print post-image for common records instead of pre-image
126
-
127
-* sp/smart-http-failure-to-push (2012-01-20) 1 commit
128
- (merged to 'next' on 2012-01-20 at a892434)
129
- + remote-curl: Fix push status report when all branches fail
130
-
131
-* tr/maint-mailinfo (2012-01-16) 2 commits
132
- (merged to 'next' on 2012-01-20 at 278fae1)
133
- + mailinfo: with -b, keep space after [foo]
134
- + am: learn passing -b to mailinfo
80
+* ar/i18n-no-gettext (2012-01-27) 4 commits
81
+ (merged to 'next' on 2012-01-27 at 0ecf258)
82
+ + i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT
83
+ (merged to 'next' on 2012-01-23 at 694a94e)
84
+ + i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n
85
+ + add a Makefile switch to avoid gettext translation in shell scripts
86
+ + git-sh-i18n: restructure the logic to compute gettext.sh scheme
87
+
88
+* da/maint-mergetool-twoway (2012-01-23) 1 commit
89
+ (merged to 'next' on 2012-01-23 at f927323)
90
+ + mergetool: Provide an empty file when needed
91
+
92
+Caters to GUI merge backends that cannot merge two files without
93
+a base by giving them an empty file as a "pretend" common ancestor.
94
+
95
+* jc/advise-i18n (2011-12-22) 1 commit
96
+ (merged to 'next' on 2012-01-23 at 6447013)
97
+ + i18n of multi-line advice messages
98
+
99
+Allow localization of advice messages that tend to be longer and
100
+multi-line formatted. For now this is deliberately limited to advise()
101
+interface and not vreportf() in general as touching the latter has
102
+interactions with error() that has plumbing callers whose prefix "error: "
103
+should never be translated.
104
+
105
+* jl/submodule-re-add (2012-01-24) 1 commit
106
+ (merged to 'next' on 2012-01-26 at 482553e)
107
+ + submodule add: fix breakage when re-adding a deep submodule
108
+
109
+"git submodule add" forgot to recompute the name to be stored in .gitmodules
110
+when the module was once added to the superproject and already initialized.
111
+
112
+* ks/sort-wildcard-in-makefile (2012-01-22) 1 commit
113
+ (merged to 'next' on 2012-01-23 at e2e0c1d)
114
+ + t/Makefile: Use $(sort ...) explicitly where needed
115
+
116
+t/Makefile is adjusted to prevent newer versions of GNU make from running
117
+tests in seemingly random order.
118
+
119
+* ld/git-p4-branches-and-labels (2012-01-20) 5 commits
120
+ (merged to 'next' on 2012-01-23 at 9020ec4)
121
+ + git-p4: label import fails with multiple labels at the same changelist
122
+ + git-p4: add test for p4 labels
123
+ + git-p4: importing labels should cope with missing owner
124
+ + git-p4: cope with labels with empty descriptions
125
+ + git-p4: handle p4 branches and labels containing shell chars
126
+ (this branch is used by va/git-p4-branch.)
127
+
128
+* nd/clone-detached (2012-01-24) 12 commits
129
+ (merged to 'next' on 2012-01-26 at 7b0cc8a)
130
+ + clone: fix up delay cloning conditions
131
+ (merged to 'next' on 2012-01-23 at bee31c6)
132
+ + push: do not let configured foreign-vcs permanently clobbered
133
+ (merged to 'next' on 2012-01-23 at 9cab64e)
134
+ + clone: print advice on checking out detached HEAD
135
+ + clone: allow --branch to take a tag
136
+ + clone: refuse to clone if --branch points to bogus ref
137
+ + clone: --branch=<branch> always means refs/heads/<branch>
138
+ + clone: delay cloning until after remote HEAD checking
139
+ + clone: factor out remote ref writing
140
+ + clone: factor out HEAD update code
141
+ + clone: factor out checkout code
142
+ + clone: write detached HEAD in bare repositories
143
+ + t5601: add missing && cascade
144
+
145
+"git clone" learned to detach the HEAD in the resulting repository when
146
+the source repository's HEAD does not point to a branch.
147
+
148
+* rr/sequencer (2012-01-11) 2 commits
149
+ (merged to 'next' on 2012-01-23 at f349b56)
150
+ + sequencer: factor code out of revert builtin
151
+ + revert: prepare to move replay_action to header
152
+
153
+Moving large chunk of code out of cherry-pick/revert for later reuse,
154
+primarily to prepare for the next cycle.
155
+
156
+* tr/grep-l-with-decoration (2012-01-23) 1 commit
157
+ (merged to 'next' on 2012-01-23 at 42b8795)
158
+ + grep: fix -l/-L interaction with decoration lines
159
+
160
+Using "git grep -l/-L" together with options -W or --break may not make
161
+much sense as the output is to only count the number of hits and there is
162
+no place for file breaks, but the latter options made "-l/-L" to miscount
163
+the hits.
164
+
165
+* va/git-p4-branch (2012-01-26) 4 commits
166
+ (merged to 'next' on 2012-01-26 at e67c52a)
167
+ + t9801: do not overuse test_must_fail
168
+ + git-p4: Change p4 command invocation
169
+ + git-p4: Add test case for complex branch import
170
+ + git-p4: Search for parent commit on branch creation
171
+ (this branch uses ld/git-p4-branches-and-labels.)
172
173
--------------------------------------------------
174
[Stalled]
@@ -169,14 +206,21 @@ Will defer till the next cycle.
206
--------------------------------------------------
207
[Cooking]
208
172
-* jl/submodule-re-add (2012-01-24) 1 commit
173
- (merged to 'next' on 2012-01-26 at 482553e)
174
- + submodule add: fix breakage when re-adding a deep submodule
209
+* bl/gitweb-project-filter (2012-01-31) 8 commits
210
+ - gitweb: Make project search respect project_filter
211
+ - gitweb: improve usability of projects search form
212
+ - gitweb: place links to parent directories in page header
213
+ - gitweb: show active project_filter in project_list page header
214
+ - gitweb: limit links to alternate forms of project_list to active project_filter
215
+ - gitweb: add project_filter to limit project list to a subdirectory
216
+ - gitweb: prepare git_get_projects_list for use outside 'forks'.
217
+ - gitweb: move hard coded .git suffix out of git_get_projects_list
218
176
-"git submodule add" forgot to recompute the name to be stored in .gitmodules
177
-when the module was once added to the superproject and already initialized.
219
+Seems to break test 9502.
220
179
-Will merge to 'master' in the second batch.
221
+* rt/completion-branch-edit-desc (2012-01-29) 1 commit
222
+ (merged to 'next' on 2012-01-31 at a0195c8)
223
+ + completion: --edit-description option for git-branch
224
225
* jn/svn-fe (2012-01-27) 44 commits
226
(merged to 'next' on 2012-01-29 at 001a395)
@@ -258,132 +302,17 @@ the "bup" fanboys, to come up with a better logic, thinking that giving
302
people an easy target to shoot for, they may be encouraged to help
303
out. The plan is not working :-(.
304
261
-* ar/i18n-no-gettext (2012-01-27) 4 commits
262
- (merged to 'next' on 2012-01-27 at 0ecf258)
263
- + i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT
264
- (merged to 'next' on 2012-01-23 at 694a94e)
265
- + i18n: Make NO_GETTEXT imply fallthrough scheme in shell l10n
266
- + add a Makefile switch to avoid gettext translation in shell scripts
267
- + git-sh-i18n: restructure the logic to compute gettext.sh scheme
268
-
269
-Will merge to 'master' in the second batch and deal with any fallout in 'master'.
270
-
271
-* da/maint-mergetool-twoway (2012-01-23) 1 commit
272
- (merged to 'next' on 2012-01-23 at f927323)
273
- + mergetool: Provide an empty file when needed
274
-
275
-Caters to GUI merge backends that cannot merge two files without
276
-a base by giving them an empty file as a "pretend" common ancestor.
277
-
278
-Will merge to 'master' in the second batch and deal with any fallout in 'master'.
279
-
280
-* ld/git-p4-branches-and-labels (2012-01-20) 5 commits
281
- (merged to 'next' on 2012-01-23 at 9020ec4)
282
- + git-p4: label import fails with multiple labels at the same changelist
283
- + git-p4: add test for p4 labels
284
- + git-p4: importing labels should cope with missing owner
285
- + git-p4: cope with labels with empty descriptions
286
- + git-p4: handle p4 branches and labels containing shell chars
287
- (this branch is used by va/git-p4-branch.)
288
-
289
-Will merge to 'master' in the second batch.
290
-
291
-* va/git-p4-branch (2012-01-26) 4 commits
292
- (merged to 'next' on 2012-01-26 at e67c52a)
293
- + t9801: do not overuse test_must_fail
294
- + git-p4: Change p4 command invocation
295
- + git-p4: Add test case for complex branch import
296
- + git-p4: Search for parent commit on branch creation
297
- (this branch uses ld/git-p4-branches-and-labels.)
298
-
299
-Rerolled and Acked.
300
-Will merge to 'master' in the second batch.
301
-
302
-* ks/sort-wildcard-in-makefile (2012-01-22) 1 commit
303
- (merged to 'next' on 2012-01-23 at e2e0c1d)
304
- + t/Makefile: Use $(sort ...) explicitly where needed
305
-
306
-t/Makefile is adjusted to prevent newer versions of GNU make from running
307
-tests in seemingly random order.
308
-
309
-Will merge to 'master' in the second batch.
310
-
311
-* tr/grep-l-with-decoration (2012-01-23) 1 commit
312
- (merged to 'next' on 2012-01-23 at 42b8795)
313
- + grep: fix -l/-L interaction with decoration lines
314
-
315
-Using "git grep -l/-L" together with options -W or --break may not make
316
-much sense as the output is to only count the number of hits and there is
317
-no place for file breaks, but the latter options made "-l/-L" to miscount
318
-the hits.
319
-
320
-Will merge to 'master' in the second batch.
321
-
305
* jc/pull-signed-tag (2012-01-23) 1 commit
306
(merged to 'next' on 2012-01-23 at 4257553)
307
+ merge: use editor by default in interactive sessions
308
326
-Per Linus's strong suggestion, sugarcoated (aka "taking blame for the
327
-original UI screw-ups") so that it is easier for me to swallow and accept
328
-a potentially huge backward incompatibility issue, "git merge" is made to
329
-launch an editor to explain the merge in the merge commit by default in
330
-interactive sessions.
331
-
332
-I've updated the special-case environment variable to MERGE_AUTOEDIT that
333
-scripts can set to "no" when they start. There is no plan to encourage
334
-humans to keep using the historical behaviour, hence there is no support
335
-for configuration variable (e.g. merge.autoedit) that can be set to 'no'.
336
-Oh, also I updated the documentation a bit.
337
-
309
"git merge" in an interactive session learned to spawn the editor by
310
default to let the user edit the auto-generated merge message, to
340
-encourage people to explain their merges better.
341
-
342
-Will merge to 'master' in the second batch and deal with any fallout in 'master'.
343
-
344
-* jc/advise-i18n (2011-12-22) 1 commit
345
- (merged to 'next' on 2012-01-23 at 6447013)
346
- + i18n of multi-line advice messages
347
-
348
-Allow localization of advice messages that tend to be longer and
349
-multi-line formatted. For now this is deliberately limited to advise()
350
-interface and not vreportf() in general as touching the latter has
351
-interactions with error() that has plumbing callers whose prefix "error: "
352
-should never be translated.
353
-
354
-Will merge to 'master' in the second batch.
355
-
356
-* rr/sequencer (2012-01-11) 2 commits
357
- (merged to 'next' on 2012-01-23 at f349b56)
358
- + sequencer: factor code out of revert builtin
359
- + revert: prepare to move replay_action to header
360
-
361
-Moving large chunk of code out of cherry-pick/revert for later reuse,
362
-primarily to prepare for the next cycle.
363
-
364
-Will merge to 'master' in the second batch.
365
-
366
-* nd/clone-detached (2012-01-24) 12 commits
367
- (merged to 'next' on 2012-01-26 at 7b0cc8a)
368
- + clone: fix up delay cloning conditions
369
- (merged to 'next' on 2012-01-23 at bee31c6)
370
- + push: do not let configured foreign-vcs permanently clobbered
371
- (merged to 'next' on 2012-01-23 at 9cab64e)
372
- + clone: print advice on checking out detached HEAD
373
- + clone: allow --branch to take a tag
374
- + clone: refuse to clone if --branch points to bogus ref
375
- + clone: --branch=<branch> always means refs/heads/<branch>
376
- + clone: delay cloning until after remote HEAD checking
377
- + clone: factor out remote ref writing
378
- + clone: factor out HEAD update code
379
- + clone: factor out checkout code
380
- + clone: write detached HEAD in bare repositories
381
- + t5601: add missing && cascade
382
-
383
-"git clone" learned to detach the HEAD in the resulting repository when
384
-the source repository's HEAD does not point to a branch.
311
+encourage people to explain their merges better. Legacy scripts can
312
+export MERGE_AUTOEDIT=no to retain the historical behaviour.
313
386
-Will merge to 'master' in the second batch and deal with any fallout in 'master'.
314
+Will merge to 'master' in the second batch and deal with any fallout in
315
+'master'.
316
317
--------------------------------------------------
318
[Discarded]