What's cooking (2012/03 #07)
Junio C Hamano committed
Mar 19, 2012 at 15:22 UTC
9d3b7fce905e7760464cc2239f9143b3b947827e
1 file changed
+170
-147
whats-cooking.txt
+170
-147
@@ -1,9 +1,9 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Mar 2012, #06; Wed, 14)
3
-X-master-at: 0e2d57fd50f61e668be3180bc8f25991ea88aa8c
4
-X-next-at: 38e1251a4abf75d6f2ce839f27cea2f57690fd15
2
+Subject: What's cooking in git.git (Mar 2012, #07; Mon, 19)
3
+X-master-at: f524129737d9ba3e685c31bacde844ec1db1fea9
4
+X-next-at: 898d27118349f1a83f6d93545cb67dbcb0b8c288
5
6
-What's cooking in git.git (Mar 2012, #06; Wed, 14)
6
+What's cooking in git.git (Mar 2012, #07; Mon, 19)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
@@ -21,77 +21,45 @@ repositories listed at
21
--------------------------------------------------
22
[Graduated to "master"]
23
24
-* az/verify-tag-use-gpg-config (2012-03-08) 1 commit
25
- (merged to 'next' on 2012-03-09 at d9e556f)
26
- + verify-tag: Parse GPG configuration options.
27
-
28
-"git tag -s" honored "gpg.program" configuration variable since
29
-1.7.9, but "git tag -v" and "git verify-tag" didn't.
30
-
31
-This is a fairly low impact fix.
32
-
33
-* jc/i18n-shell-script-gettext (2012-03-12) 1 commit
34
- (merged to 'next' on 2012-03-12 at 1326b5e)
35
- + i18n: fix auto detection of gettext scheme for shell scripts
36
-
37
-The auto detection was testing if a fixed string that is known to be
38
-non-empty is empty by mistake.
39
-
40
-* jc/maint-undefined-i18n-observation-test (2012-03-09) 1 commit
41
- (merged to 'next' on 2012-03-12 at 42aaabe)
42
- + t0204: clarify the "observe undefined behaviour" test
43
-
44
-It was unclear what a test in t0204 wanted to check; it turns out
45
-that it was only to observe an undefined behaviour of the system,
46
-and did not anticipate one kind of reasonable error behaviour.
47
-
48
-Replaces the tb/maint-remove-irrelevant-i18n-test topic.
49
-
50
-* ms/maint-config-error-at-eol-linecount (2012-03-12) 1 commit
51
- (merged to 'next' on 2012-03-12 at ba17441)
52
- + config: report errors at the EOL with correct line number
53
-
54
-When "git config" diagnoses an error in a configuration file and
55
-shows the line number for the offending line, it miscounted if the
56
-error was at the end of line.
24
+* ab/perl-i18n (2012-03-10) 3 commits
25
+ + perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
26
+ + Git::I18N: compatibility with perl <5.8.3
27
58
-* ph/rerere-doc (2012-03-08) 1 commit
59
- (merged to 'next' on 2012-03-12 at 2456f65)
60
- + rerere: Document 'rerere remaining'
28
+Attempts to help installations with ancient Perl and/or without
29
+MakeMaker.
30
62
---------------------------------------------------
63
-[New Topics]
31
+* jc/maint-verify-objects-remove-pessimism (2012-03-15) 1 commit
32
+ (merged to 'next' on 2012-03-15 at f824530)
33
+ + fetch/receive: remove over-pessimistic connectivity check
34
65
-* jh/notes-merge-in-git-dir-worktree (2012-03-12) 2 commits
66
- - notes-merge: use opendir/readdir instead of using read_directory()
67
- - t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
35
+The code to validate the history connectivity between old refs and new
36
+refs used by fetch and receive-pack, introduced in 1.7.8, was grossly
37
+inefficient and unnecessarily tried to re-validate integrity of individual
38
+objects. This essentially reverts the patch that introduced the
39
+performance regression.
40
69
-Running "notes merge --commit" failed to perform correctly when run
70
-from any directory inside $GIT_DIR/. When "notes merge" stops with
71
-conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
72
-to resolve it.
41
+* jn/maint-fast-import-empty-ls (2012-03-09) 2 commits
42
+ (merged to 'next' on 2012-03-15 at d531079)
43
+ + fast-import: don't allow 'ls' of path with empty components
44
+ + fast-import: leakfix for 'ls' of dirty trees
45
74
-Not urgent.
46
+fast-import did not diagnose "ls ''" that asks an empty path
47
+as an error.
48
76
-* jn/diffstat-tests (2012-03-13) 7 commits
77
- - diffstat summary line varies by locale: miscellany
78
- - test: use numstat instead of diffstat in binary-diff test
79
- - test: use --numstat instead of --stat in "git stash show" tests
80
- - test: test cherry-pick functionality and output separately
81
- - test: modernize funny-names test style
82
- - test: use numstat instead of diffstat in funny-names test
83
- - test: use test_i18ncmp when checking --stat output
49
+* sl/customize-sane-tool-path (2012-03-09) 1 commit
50
+ (merged to 'next' on 2012-03-15 at a838844)
51
+ + configure: allow user to prevent $PATH "sanitization" on Solaris
52
85
-Some tests checked the "diff --stat" output when they do not have to,
86
-which unnecessarily made things harder to verify under GETTEXT_POISON.
87
-Not urgent.
53
+"configure" script learned to take "--sane-tool-path" from the command
54
+line to record SANE_TOOL_PATH (used to avoid broken platform tools in
55
+/usr/bin) in config.mak-autogen. This may be useful for people on Solaris
56
+who have saner tools outside /usr/xpg[46]/bin.
57
58
* th/doc-diff-submodule-option (2012-03-14) 1 commit
59
(merged to 'next' on 2012-03-14 at 0e1d755)
60
+ Documentation/diff-options: reword description of --submodule option
61
62
Update "diff --submodule" documentation.
94
-May want to ship with 1.7.10.
63
64
* th/git-diffall (2012-03-14) 5 commits
65
(merged to 'next' on 2012-03-14 at 38e1251)
@@ -102,37 +70,83 @@ May want to ship with 1.7.10.
70
+ contrib/diffall: comment actual reason for 'cdup'
71
72
Update sample "diffall" script.
105
-May want to ship with 1.7.10.
73
107
-* tr/maint-word-diff-regex-sticky (2012-03-14) 3 commits
108
- - diff: tweak a _copy_ of diff_options with word-diff
109
- - diff: refactor the word-diff setup from builtin_diff_cmd
110
- - t4034: diff.*.wordregex should not be "sticky" in --word-diff
74
+* th/mergetools-deltawalker (2012-03-15) 1 commit
75
+ (merged to 'next' on 2012-03-15 at 1a62faf)
76
+ + Documentation/difftool: add deltawalker to list of valid diff tools
77
+
78
+--------------------------------------------------
79
+[New Topics]
80
+
81
+* jc/maint-clean-nested-worktree-in-subdir (2012-03-15) 2 commits
82
+ - clean: preserve nested git worktree in subdirectories
83
+ - remove_dir_recursively(): Add flag for skipping removal of toplevel dir
84
+ (this branch is tangled with jh/notes-merge-in-git-dir-worktree.)
85
+
86
+"git clean -d -f" (not "-d -f -f") is supposed to protect nested working
87
+trees of independent git repositories that exist in the current project
88
+working tree from getting removed, but the protection applied only to such
89
+working trees that are at the top-level of the current project by mistake.
90
112
-The regexp configured with wordregex was incorrectly reused across
113
-files.
91
Not urgent.
92
116
-* zj/test-cred-helper-nicer-prove (2012-03-14) 3 commits
117
- - t0303: resurrect commit message as test documentation
118
- - fixup?
119
- - t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER
93
+* ct/advise-push-default (2012-03-19) 1 commit
94
+ - push: Provide situational hints for non-fast-forward errors
95
+
96
+Breaks down the cases in which "git push" fails due to non-ff into three
97
+categories, and gives separate advise messages. I think there should be
98
+three advise confvars, not just two.
99
+
100
+* nl/rebase-i-cheat-sheet (2012-03-16) 1 commit
101
+ - [Do not merge] rebase -i: remind that the lines are top-to-bottom
102
121
-Minor improvement to t0303.
103
Not urgent.
104
105
+* da/difftool-test (2012-03-19) 1 commit
106
+ - t7800: Test difftool passing arguments to diff
107
+
108
+Makes sure "difftool" options can be given in any order.
109
+
110
+* th/difftool-diffall (2012-03-19) 9 commits
111
+ - difftool: print list of valid tools with '--tool-help'
112
+ - difftool: teach dir-diff to copy modified files back to working tree
113
+ - difftool: teach difftool to handle directory diffs
114
+ - difftool: replace system call with Git::command_noisy
115
+ - difftool: eliminate setup_environment function
116
+ - difftool: stop appending '.exe' to git
117
+ - difftool: remove explicit change of PATH
118
+ - difftool: exit(0) when usage is printed
119
+ - difftool: parse options using Getopt::Long
120
+
121
+Reworks the "diffall" contrib script into "difftool" framework. Use of
122
+Getopt::Long obviously contradicts with da/difftool-test and breaks 'pu'.
123
+
124
--------------------------------------------------
125
[Stalled]
126
127
-* ab/perl-i18n (2012-03-10) 3 commits
128
- - fixup! de1e4ae
129
- - perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKER
130
- - Git::I18N: compatibility with perl <5.8.3
127
+* nd/columns (2012-03-13) 12 commits
128
+ - column: support grouping entries
129
+ - column: support "denser" mode
130
+ - ls-files: support --column
131
+ - tag: add --column
132
+ - column: support piping stdout to external git-column process
133
+ - status: add --column
134
+ - branch: add --column
135
+ - help: reuse print_columns() for help -a
136
+ - column: add dense layout support
137
+ - column: add columnar layout
138
+ - Stop starting pager recursively
139
+ - Add column layout skeleton and git-column
140
132
-Attempts to help installations with ancient Perl and/or without
133
-MakeMaker. Didn't quite work for me, so I tried to queue a fix-up
134
-commit, but an independent confirmation report is needed before it
135
-is squashed into Ævar's patches.
141
+Rerolled again. Modulo minor nits, looked nicer than the previous round.
142
+
143
+* nd/threaded-index-pack (2012-03-11) 2 commits
144
+ - index-pack: support multithreaded delta resolving
145
+ - index-pack: split second pass obj handling into own function
146
+
147
+Another reroll after a bugreport on pthread usage discovered by Ramsey,
148
+but it seems the topic is cooking between Ramsay and Duy out of tree.
149
+Waiting for resolution.
150
151
* dg/test-from-elsewhere (2012-03-04) 2 commits
152
- Support out-of-tree Valgrind tests
@@ -160,14 +174,6 @@ Needs more work; results in double-frees.
174
175
The bottom one was not clearly explained and needs a reroll.
176
163
-* jc/advise-push-default (2011-12-18) 1 commit
164
- - push: hint to use push.default=upstream when appropriate
165
-
166
-Peff had a good suggestion outlining an updated code structure so
167
-that somebody new can try to dip his or her toes in the development.
168
-
169
-A rework is being attempted by Christopher Tiwald.
170
-
177
* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits
178
- fixup! 15eaaf4
179
- git-svn, perl/Git.pm: extend Git::prompt helper for querying users
@@ -178,8 +184,7 @@ from Ævar. The second one needs more work, both in perl/Git.pm and
184
prompt.c, to give precedence to tty over SSH_ASKPASS when terminal
185
is available.
186
181
-* jc/split-blob (2012-02-23) 7 commits
182
- - fixup?
187
+* jc/split-blob (2012-03-16) 6 commits
188
- chunked-object: streaming checkout
189
- chunked-object: fallback checkout codepaths
190
- bulk-checkin: support chunked-object encoding
@@ -212,27 +217,49 @@ not working :-(.
217
--------------------------------------------------
218
[Cooking]
219
215
-* nd/columns (2012-03-13) 12 commits
216
- - column: support grouping entries
217
- - column: support "denser" mode
218
- - ls-files: support --column
219
- - tag: add --column
220
- - column: support piping stdout to external git-column process
221
- - status: add --column
222
- - branch: add --column
223
- - help: reuse print_columns() for help -a
224
- - column: add dense layout support
225
- - column: add columnar layout
226
- - Stop starting pager recursively
227
- - Add column layout skeleton and git-column
220
+* jh/notes-merge-in-git-dir-worktree (2012-03-15) 4 commits
221
+ - notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd
222
+ - notes-merge: use opendir/readdir instead of using read_directory()
223
+ - t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/
224
+ - remove_dir_recursively(): Add flag for skipping removal of toplevel dir
225
+ (this branch is tangled with jc/maint-clean-nested-worktree-in-subdir.)
226
229
-Rerolled again. Modulo minor nits, looked nicer than the previous round.
227
+Running "notes merge --commit" failed to perform correctly when run
228
+from any directory inside $GIT_DIR/. When "notes merge" stops with
229
+conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits
230
+to resolve it.
231
231
-* nd/optim-connected (2012-03-14) 1 commit
232
- - {fetch,receive}-pack: skip sha-1 integrity test on objects from new pack
232
+Not urgent.
233
234
-Optimizes the local connectivity check performed by "git fetch" and "git
235
-receive-pack" that is run in response to "git push".
234
+* jn/diffstat-tests (2012-03-13) 7 commits
235
+ - diffstat summary line varies by locale: miscellany
236
+ - test: use numstat instead of diffstat in binary-diff test
237
+ - test: use --numstat instead of --stat in "git stash show" tests
238
+ - test: test cherry-pick functionality and output separately
239
+ - test: modernize funny-names test style
240
+ - test: use numstat instead of diffstat in funny-names test
241
+ - test: use test_i18ncmp when checking --stat output
242
+
243
+Some tests checked the "diff --stat" output when they do not have to,
244
+which unnecessarily made things harder to verify under GETTEXT_POISON.
245
+
246
+Not urgent.
247
+
248
+* tr/maint-word-diff-regex-sticky (2012-03-14) 3 commits
249
+ - diff: tweak a _copy_ of diff_options with word-diff
250
+ - diff: refactor the word-diff setup from builtin_diff_cmd
251
+ - t4034: diff.*.wordregex should not be "sticky" in --word-diff
252
+
253
+The regexp configured with wordregex was incorrectly reused across
254
+files.
255
+Not urgent.
256
+
257
+* zj/test-cred-helper-nicer-prove (2012-03-15) 2 commits
258
+ - t0303: resurrect commit message as test documentation
259
+ - t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER
260
+
261
+Minor improvement to t0303.
262
+Not urgent.
263
264
* jc/commit-hook-authorship (2012-03-11) 3 commits
265
(merged to 'next' on 2012-03-12 at 05ca7f8)
@@ -248,32 +275,28 @@ environment variable. This is a simpler of the two approaches.
275
276
Will defer til 1.7.10.
277
251
-* jc/run-hook-env-1 (2012-03-11) 4 commits
252
- . commit: pass author/committer info to hooks
278
+* jc/run-hook-env-1 (2012-03-11) 3 commits
279
- run_hook(): enhance the interface to pass arbitrary environment
280
+ t7503: does pre-commit-hook learn authorship?
281
+ ident.c: add split_ident_line() to parse formatted ident line
282
(this branch is tangled with jc/commit-hook-authorship.)
283
258
-Addresses the same issue as jc/commit-hook-authorship, sharing the first
259
-two changes with the previous one, but uses a more complex approach, which
260
-may not be worth the complexity. The third patch is a prerequiste for the
261
-fourth one (not used), but is independently useful.
262
-
263
-* jn/maint-fast-import-empty-ls (2012-03-09) 2 commits
264
- - fast-import: don't allow 'ls' of path with empty components
265
- - fast-import: leakfix for 'ls' of dirty trees
284
+Not urgent.
285
267
-fast-import did not diagnose "ls ''" that asks an empty path
268
-as an error.
286
+Updates run_hook() API to be much less specific to "commit". It would
287
+only be useful if people start doing more interesting things with hooks.
288
289
* jc/diff-algo-cleanup (2012-02-19) 2 commits
271
- - xdiff: PATIENCE/HISTOGRAM are not independent option bits
272
- - xdiff: remove XDL_PATCH_* macros
290
+ (merged to 'next' on 2012-03-15 at cca0032)
291
+ + xdiff: PATIENCE/HISTOGRAM are not independent option bits
292
+ + xdiff: remove XDL_PATCH_* macros
293
(this branch is used by jc/diff-ignore-case.)
294
275
-Resurrects the preparatory clean-up patches from another topic
276
-that was discarded.
295
+Resurrects the preparatory clean-up patches from another topic that was
296
+discarded, as this would give a saner foundation to build on diff.algo
297
+configuration option series.
298
+
299
+Not urgent.
300
301
* jh/apply-free-patch (2012-03-07) 1 commit
302
- apply: do not leak patches and fragments
@@ -296,30 +319,22 @@ Will discard.
319
* mm/push-default-switch-warning (2012-03-09) 1 commit
320
- push: start warning upcoming default change for push.default
321
299
-This resurrects an ancient patch I wrote during a discussion we had
300
-in the 1.6.3-1.6.4 era. It also conflicts with the long-stalled
301
-jc/advise-push-default topic and for a good reason---they address a
302
-similar issue. The latter is a lower impact patch that uses a more
303
-focused approach to limit the scope to the target audience that
304
-actually needs help.
305
-
306
-* sl/customize-sane-tool-path (2012-03-09) 1 commit
307
- - configure: allow user to prevent $PATH "sanitization" on Solaris
322
+Not urgent.
323
309
-Would be nice to hear from people who actually use autoconf, either
310
-on Solaris or other platforms.
324
+This resurrects an ancient patch I wrote during a discussion we had in the
325
+1.6.3-1.6.4 era. This should probably come after ct/advise-push-default
326
+topic and at that point the advise messages need to be rephrased, taking
327
+the future default change into account.
328
329
* jc/fmt-merge-msg-people (2012-03-13) 1 commit
330
- fmt-merge-msg: show those involved in a merged series
331
315
-Rerolled.
316
-
332
The "fmt-merge-msg" command learns to list the primary contributors
333
involved in the side topic you are merging.
334
335
Will defer til 1.7.10.
336
322
-* nl/http-proxy-more (2012-03-14) 5 commits
337
+* nl/http-proxy-more (2012-03-15) 5 commits
338
- http: rename HTTP_REAUTH to HTTP_AUTH_RETRY
339
- http: Avoid limit of retrying request only twice
340
- http: handle proxy authentication failure (error 407)
@@ -346,13 +361,6 @@ reduce the memory footprint. In general, looked fairly good.
361
362
Will defer til 1.7.10.
363
349
-* nd/threaded-index-pack (2012-03-11) 2 commits
350
- - index-pack: support multithreaded delta resolving
351
- - index-pack: split second pass obj handling into own function
352
-
353
-Another reroll after a bugreport on pthread usage discovered by
354
-Ramsey.
355
-
364
--------------------------------------------------
365
[Discarded]
366
@@ -371,3 +379,18 @@ Ramsey.
379
. Use startup_info->prefix rather than prefix.
380
381
I tend to agree with the doubt of the author of this patch expressed.
382
+
383
+* nd/optim-connected (2012-03-15) 1 commit
384
+ . {fetch,receive}-pack: skip sha-1 integrity test on objects from new pack
385
+
386
+jc/maint-verify-objects-remove-pessimism replaces this.
387
+
388
+* jc/advise-push-default (2011-12-18) 1 commit
389
+ . push: hint to use push.default=upstream when appropriate
390
+
391
+A rework by Christopher Tiwald replaces this.
392
+
393
+* th/mergetools-tool-help (2012-03-15) 1 commit
394
+ . difftool: print list of valid tools with '--tool-help'
395
+
396
+Reworked as part of th/difftool-diffall topic.