What's cooking (2012/06 #06)
Junio C Hamano committed
Jun 21, 2012 at 15:52 UTC
c36e19f6cfadfcb76926545efe74588d5c9a6690
1 file changed
+180
-160
whats-cooking.txt
+180
-160
@@ -1,17 +1,15 @@
1
To: git@vger.kernel.org
2
-Subject: What's cooking in git.git (Jun 2012, #05; Tue, 19)
3
-X-master-at: d28436736a078a429213003a9472e8caeb86c286
4
-X-next-at: 4a7aa997f0006fbd039bce2d9fedafc4a70322d7
2
+Subject: What's cooking in git.git (Jun 2012, #06; Thu, 21)
3
+X-master-at: 0e18bef7e62d6fffd09c394381056ec7a4a79840
4
+X-next-at: d03daced714572d0060e2bd8ae5e751b5a245f46
5
6
-What's cooking in git.git (Jun 2012, #05; Tue, 19)
6
+What's cooking in git.git (Jun 2012, #06; Thu, 21)
7
--------------------------------------------------
8
9
Here are the topics that have been cooking. Commits prefixed with '-' are
10
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
11
12
-Now 1.7.11 is out, I'll start merging topics that have been cooking
13
-in 'next' to 'master', but let's wait for a few days in case some
14
-brown paper bag bugfixes are needed.
12
+A brown-paper bag release 1.7.11.1 is out.
13
14
You can find the changes described here in the integration branches of the
15
repositories listed at
@@ -19,58 +17,86 @@ repositories listed at
17
http://git-blame.blogspot.com/p/git-public-repositories.html
18
19
--------------------------------------------------
22
-[New Topics]
20
+[Graduated to "master"]
21
24
-* cn/cherry-pick-range-docs (2012-06-15) 2 commits
25
- - git-cherry-pick.txt: clarify the use of revision range notation
26
- - Documentation: --no-walk is no-op if range is specified
22
+* jc/bundle-complete-notice (2012-06-04) 1 commit
23
+ (merged to 'next' on 2012-06-19 at b42227b)
24
+ + tweak "bundle verify" of a complete history
25
28
-Will merge to 'next' and soon to 'master'.
26
+Originally merged to 'next' on 2012-06-04.
27
30
-* jc/sha1-name-more (2012-06-18) 9 commits
31
- - sha1_name.c: get_describe_name() by definition groks only commits
32
- - sha1_name.c: teach get_short_sha1() a commit-only option
33
- - sha1_name.c: allow get_short_sha1() to take other flags
34
- - sha1_name.c: teach find_short_packed_object() a commit-only option
35
- - sha1_name.c: teach find_short_object_filename() a commit-only option
36
- - sha1_name.c: refactor find_short_packed_object()
37
- - sha1_name.c: rename "now" to "current"
38
- - sha1_name.c: clarify what "fake" is for in find_short_object_filename()
39
- - sha1_name.c: indentation fix
28
+Running "git bundle verify" on a bundle that records a complete
29
+history said "it requires these 0 commits".
30
41
-Teaches the object name parser that a "git describe" output is
42
-always a commit object, to prolong the lifetime of abbreviated
43
-object name in it.
31
+* jc/ls-files-i-dir (2012-06-05) 6 commits
32
+ (merged to 'next' on 2012-06-19 at 4a7aa99)
33
+ + dir.c: make excluded() file scope static
34
+ + unpack-trees.c: use path_excluded() in check_ok_to_remove()
35
+ + builtin/add.c: use path_excluded()
36
+ + path_excluded(): update API to less cache-entry centric
37
+ + ls-files -i: micro-optimize path_excluded()
38
+ + ls-files -i: pay attention to exclusion of leading paths
39
45
-* jk/version-string-dependency (2012-06-19) 3 commits
46
- - Makefile: split prefix flags from GIT-CFLAGS
47
- - Makefile: split GIT_USER_AGENT from GIT-CFLAGS
48
- - Makefile: apply dependencies consistently to sparse/asm targets
49
- (this branch uses jk/version-string.)
40
+Originally merged to 'next' on 2012-06-08.
41
51
-* jn/perl-makemaker-leading-paths (2012-06-15) 1 commit
52
- - perl/Makefile: move "mkdir -p" to module installation loop for maintainability
42
+"git ls-files --exclude=t -i" did not consider anything under t/
43
+as excluded, as it did not pay attention to exclusion of leading
44
+paths while walking the index. Other two users of excluded() are
45
+also updated.
46
54
-Will wait for a few days to see if somebody comes up with a more
55
-concise and cleaner way to do this, but otherwise this looked good.
47
+* jc/request-pull-match-tagname (2012-06-01) 1 commit
48
+ (merged to 'next' on 2012-06-19 at bb96d6c)
49
+ + request-pull: really favor a matching tag
50
57
-* mm/verify-filename-fix (2012-06-18) 2 commits
58
- - verify_filename(): ask the caller to chose the kind of diagnosis
59
- - sha1_name: do not trigger detailed diagnosis for file arguments
51
+Originally merged to 'next' on 2012-06-05.
52
61
-"git diff COPYING HEAD:COPYING" gave a nonsense error message that
62
-claimed that the treeish HEAD did not have COPYING in it.
53
+"git request-pull $url dev" when the tip of "dev" branch was tagged
54
+with "ext4-for-linus" used the contents from the tag in the output
55
+but still asked the "dev" branch to be pulled, not the tag.
56
64
-Will merge to 'next' and soon to 'master'.
57
+* jk/clone-local (2012-05-30) 2 commits
58
+ (merged to 'next' on 2012-06-19 at a42bbcc)
59
+ + clone: allow --no-local to turn off local optimizations
60
+ + docs/clone: mention that --local may be ignored
61
66
-* tr/maint-show-walk (2012-06-19) 2 commits
67
- - show: fix "range implies walking"
68
- - Demonstrate git-show is broken with ranges
62
+Originally merged to 'next' on 2012-06-05.
63
70
-Fixes "git show"'s auto-walking behaviour, and make it behave just
71
-like "git log" does when it walks.
64
+"git clone --local $path" started its life as an experiment to
65
+optionally use link/copy when cloning a repository on the disk, but
66
+we didn't deprecate it after we made the option a no-op to always
67
+use the optimization.
68
73
-Note that this is different from Thomas's patch.
69
+The command learns "--no-local" option to turn this off, as a more
70
+explicit alternative over use of file:// URL.
71
+
72
+* jk/maint-t1304-setfacl (2012-06-07) 1 commit
73
+ (merged to 'next' on 2012-06-19 at 2449521)
74
+ + t1304: improve setfacl prerequisite setup
75
+
76
+Originally merged to 'next' on 2012-06-08.
77
+
78
+Works around a false test failure caused by a bug in ecryptofs.
79
+
80
+* jk/version-string (2012-06-03) 3 commits
81
+ (merged to 'next' on 2012-06-19 at 12f8e07)
82
+ + http: get default user-agent from git_user_agent
83
+ + version: add git_user_agent function
84
+ + move git_version_string into version.c
85
+ (this branch is used by jk/version-string-dependency.)
86
+
87
+Originally merged to 'next' on 2012-06-05.
88
+
89
+Teaches git native protocol agents to show software version over the
90
+wire.
91
+
92
+* vr/help-per-platform (2012-06-06) 1 commit
93
+ (merged to 'next' on 2012-06-19 at d9a08ba)
94
+ + help: use HTML as the default help format on Windows
95
+
96
+Originally merged to 'next' on 2012-06-08
97
+
98
+We used to always default to "man" format even on platforms where
99
+"man" viewer is not widely available.
100
101
--------------------------------------------------
102
[Stalled]
@@ -207,6 +233,73 @@ not working :-(.
233
--------------------------------------------------
234
[Cooking]
235
236
+* cn/cherry-pick-range-docs (2012-06-15) 2 commits
237
+ (merged to 'next' on 2012-06-21 at 5cf7f97)
238
+ + git-cherry-pick.txt: clarify the use of revision range notation
239
+ + Documentation: --no-walk is no-op if range is specified
240
+
241
+The command line argument of "git cherry-pick maint master..next" is
242
+just an ordinary revision range, which is unintuitive and at least
243
+deserves documentation.
244
+
245
+Will merge to 'master'.
246
+
247
+* jc/sha1-name-more (2012-06-21) 9 commits
248
+ - sha1_name.c: get_describe_name() by definition groks only commits
249
+ - sha1_name.c: teach get_short_sha1() a commit-only option
250
+ - sha1_name.c: allow get_short_sha1() to take other flags
251
+ - sha1_name.c: restructure disambiguation of short names
252
+ - sha1_name.c: correct misnamed "canonical" and "res"
253
+ - sha1_name.c: refactor find_short_packed_object()
254
+ - sha1_name.c: rename "now" to "current"
255
+ - sha1_name.c: clarify what "fake" is for in find_short_object_filename()
256
+ - sha1_name.c: indentation fix
257
+
258
+Teaches the object name parser that a "git describe" output is
259
+always a commit object, to prolong the lifetime of abbreviated
260
+object name in it.
261
+
262
+* jk/version-string-dependency (2012-06-20) 11 commits
263
+ - Makefile: move GIT-VERSION-FILE dependencies closer to use
264
+ - Makefile: build instaweb similar to other scripts
265
+ - Makefile: update scripts when build-time parameters change
266
+ - Makefile: do not replace @@GIT_VERSION@@ in shell scripts
267
+ - Makefile: split prefix flags from GIT-CFLAGS
268
+ - Makefile: split GIT_USER_AGENT from GIT-CFLAGS
269
+ - Makefile: do not replace @@GIT_USER_AGENT@@ in scripts
270
+ - Makefile: apply dependencies consistently to sparse/asm targets
271
+ - Makefile: do not have git.o depend on common-cmds.h
272
+ - Makefile: fold MISC_H into LIB_H
273
+ - Makefile: sort LIB_H list
274
+
275
+Will hold in 'pu' to give Peff and Jonathan to work out improvements
276
+for a week or so.
277
+
278
+* jn/perl-makemaker-leading-paths (2012-06-15) 1 commit
279
+ - perl/Makefile: move "mkdir -p" to module installation loop for maintainability
280
+
281
+Will wait for a few days to see if somebody comes up with a more
282
+concise and cleaner way to do this, but otherwise this looked good.
283
+
284
+* mm/verify-filename-fix (2012-06-18) 2 commits
285
+ (merged to 'next' on 2012-06-21 at d03dace)
286
+ + verify_filename(): ask the caller to chose the kind of diagnosis
287
+ + sha1_name: do not trigger detailed diagnosis for file arguments
288
+
289
+"git diff COPYING HEAD:COPYING" gave a nonsense error message that
290
+claimed that the treeish HEAD did not have COPYING in it.
291
+
292
+Will merge to 'master'.
293
+
294
+* tr/maint-show-walk (2012-06-19) 2 commits
295
+ - show: fix "range implies walking"
296
+ - Demonstrate git-show is broken with ranges
297
+
298
+Fixes "git show"'s auto-walking behaviour, and make it behave just
299
+like "git log" does when it walks.
300
+
301
+Note that this is different from Thomas's patch.
302
+
303
* fc/git-prompt-script (2012-06-19) 7 commits
304
- completion: respect $GIT_DIR
305
- completion: warn people about duplicated function
@@ -224,45 +317,53 @@ completion part while making prompting part always available.
317
Will merge to 'next'.
318
319
* lm/git-blame-el (2012-06-14) 3 commits
227
- - git-blame.el: Do not use bare 0 to mean (point-min)
228
- - git-blame.el: Use with-current-buffer where appropriate
229
- - git-blame.el: Do not use goto-line in lisp code
320
+ (merged to 'next' on 2012-06-21 at 6514487)
321
+ + git-blame.el: Do not use bare 0 to mean (point-min)
322
+ + git-blame.el: Use with-current-buffer where appropriate
323
+ + git-blame.el: Do not use goto-line in lisp code
324
231
-Will merge to 'next' and soon to 'master'.
325
+Will merge to 'master'.
326
327
* lp/no-cmd-http-fetch (2012-06-15) 1 commit
234
- - builtin.h: remove unused cmd_<foo> declarations
328
+ (merged to 'next' on 2012-06-21 at 242a10e)
329
+ + builtin.h: remove unused cmd_<foo> declarations
330
236
-Will merge to 'next' and soon to 'master'.
331
+Will merge to 'master'.
332
333
* jk/diff-no-index-pager (2012-06-15) 2 commits
239
- - do not run pager with diff --no-index --quiet
240
- - fix pager.diff with diff --no-index
334
+ (merged to 'next' on 2012-06-21 at e2a2562)
335
+ + do not run pager with diff --no-index --quiet
336
+ + fix pager.diff with diff --no-index
337
+
338
+"git diff --no-index" did not work with pagers correctly.
339
242
-Will merge to 'next' and soon to 'master'.
340
+Will merge to 'master'.
341
342
* nd/i18n-branch-lego (2012-06-07) 1 commit
245
- - Remove i18n legos in notifying new branch tracking setup
343
+ (merged to 'next' on 2012-06-21 at 0cb53fc)
344
+ + Remove i18n legos in notifying new branch tracking setup
345
346
Restructure the way message strings are created, in preparation for
347
marking them for i18n.
348
250
-Will merge to 'next' and soon to 'master'.
349
+Will merge to 'master'.
350
351
* nd/i18n-misc (2012-06-07) 3 commits
253
- - rerere: remove i18n legos in result message
254
- - notes-merge: remove i18n legos in merge result message
255
- - reflog: remove i18n legos in pruning message
352
+ (merged to 'next' on 2012-06-21 at 0a82040)
353
+ + rerere: remove i18n legos in result message
354
+ + notes-merge: remove i18n legos in merge result message
355
+ + reflog: remove i18n legos in pruning message
356
357
Restructure the way message strings are created, in preparation for
358
marking them for i18n.
359
260
-Will merge to 'next' and soon to 'master'.
360
+Will merge to 'master'.
361
362
* rr/doc-commit (2012-06-08) 1 commit
263
- - commit: document a couple of options
363
+ (merged to 'next' on 2012-06-21 at af8301c)
364
+ + commit: document a couple of options
365
265
-Will merge to 'next' and soon to 'master'.
366
+Will merge to 'master'.
367
368
* hv/remote-end-hung-up (2012-06-19) 1 commit
369
- remove the impression of unexpectedness when access is denied
@@ -282,19 +383,28 @@ Will merge to 'next'.
383
I need to send this out to the list for re-review.
384
385
* jc/ustar-checksum-is-unsigned (2012-06-13) 1 commit
285
- - archive: ustar header checksum is computed unsigned
386
+ (merged to 'next' on 2012-06-21 at bb8e2b0)
387
+ + archive: ustar header checksum is computed unsigned
388
287
-Will merge to 'next' and soon to 'master'.
389
+"git archive" incorrectly computed the header checksum; the symptom
390
+was observed only when using pathnames with hi-bit set.
391
+
392
+Will merge to 'master'.
393
394
* rs/git-blame-mapcar-mapc (2012-06-10) 1 commit
290
- - git-blame.el: use mapc instead of mapcar
395
+ (merged to 'next' on 2012-06-21 at 71a3b36)
396
+ + git-blame.el: use mapc instead of mapcar
397
292
-Will merge to 'next' and soon to 'master'.
398
+Will merge to 'master'.
399
400
* rs/ipv6-ssh-url (2012-06-13) 1 commit
295
- - git: Wrong parsing of ssh urls with IPv6 literals ignores port
401
+ (merged to 'next' on 2012-06-21 at d0116a8)
402
+ + git: Wrong parsing of ssh urls with IPv6 literals ignores port
403
297
-Will merge to 'next' and soon to 'master'.
404
+Will merge to 'master'.
405
+
406
+ssh:// URLs to IPv6 hosts with custom port number were parsed
407
+incorrectly.
408
409
* nd/exclude-workaround-top-heavy (2012-06-07) 3 commits
410
- exclude: do strcmp as much as possible before fnmatch
@@ -307,17 +417,6 @@ without wildcard literally.
417
418
Will merge to 'next'.
419
310
-* jc/bundle-complete-notice (2012-06-04) 1 commit
311
- (merged to 'next' on 2012-06-19 at b42227b)
312
- + tweak "bundle verify" of a complete history
313
-
314
-Originally merged to 'next' on 2012-06-04.
315
-
316
-Running "git bundle verify" on a bundle that records a complete
317
-history said "it requires these 0 commits".
318
-
319
-Will merge to 'master'.
320
-
420
* lk/more-helpful-status-hints (2012-06-14) 4 commits
421
- status: better advices when splitting a commit (during rebase -i)
422
- status: don't suggest "git rm" or "git add" if not appropriate
@@ -331,16 +430,6 @@ Will merge to 'next'.
430
431
On hold for 6 months until ancient "less" goes extinct.
432
334
-* jk/maint-t1304-setfacl (2012-06-07) 1 commit
335
- (merged to 'next' on 2012-06-19 at 2449521)
336
- + t1304: improve setfacl prerequisite setup
337
-
338
-Originally merged to 'next' on 2012-06-08.
339
-
340
-Works around a false test failure caused by a bug in ecryptofs.
341
-
342
-Will merge to 'master'.
343
-
433
* lk/rebase-i-x (2012-06-13) 1 commit
434
- rebase -i: teach "--exec <cmd>"
435
@@ -349,80 +438,11 @@ commit in the resulting history.
438
439
Will merge to 'next'.
440
352
-* vr/help-per-platform (2012-06-06) 1 commit
353
- (merged to 'next' on 2012-06-19 at d9a08ba)
354
- + help: use HTML as the default help format on Windows
355
-
356
-Originally merged to 'next' on 2012-06-08
357
-
358
-We used to always default to "man" format even on platforms where
359
-"man" viewer is not widely available.
360
-
361
-Will merge to 'master'.
362
-
363
-* jc/ls-files-i-dir (2012-06-05) 6 commits
364
- (merged to 'next' on 2012-06-19 at 4a7aa99)
365
- + dir.c: make excluded() file scope static
366
- + unpack-trees.c: use path_excluded() in check_ok_to_remove()
367
- + builtin/add.c: use path_excluded()
368
- + path_excluded(): update API to less cache-entry centric
369
- + ls-files -i: micro-optimize path_excluded()
370
- + ls-files -i: pay attention to exclusion of leading paths
371
-
372
-Originally merged to 'next' on 2012-06-08.
373
-
374
-"git ls-files --exclude=t -i" did not consider anything under t/
375
-as excluded, as it did not pay attention to exclusion of leading
376
-paths while walking the index. Other two users of excluded() are
377
-also updated.
378
-
379
-Will merge to 'master'.
380
-
381
-* jc/request-pull-match-tagname (2012-06-01) 1 commit
382
- (merged to 'next' on 2012-06-19 at bb96d6c)
383
- + request-pull: really favor a matching tag
384
-
385
-Originally merged to 'next' on 2012-06-05.
386
-
387
-"git request-pull $url dev" when the tip of "dev" branch was tagged
388
-with "ext4-for-linus" used the contents from the tag in the output
389
-but still asked the "dev" branch to be pulled, not the tag.
390
-
391
-Will merge to 'master'.
392
-
393
-* jk/version-string (2012-06-03) 3 commits
394
- (merged to 'next' on 2012-06-19 at 12f8e07)
395
- + http: get default user-agent from git_user_agent
396
- + version: add git_user_agent function
397
- + move git_version_string into version.c
398
- (this branch is used by jk/version-string-dependency.)
399
-
400
-Originally merged to 'next' on 2012-06-05.
401
-
402
-Teaches git native protocol agents to show software version over the
403
-wire.
404
-
405
-Will merge to 'master'.
406
-
441
* nd/stream-pack-objects (2012-05-29) 1 commit
442
- pack-objects: use streaming interface for reading large loose blobs
443
444
Will merge to 'next'.
445
412
-* jk/clone-local (2012-05-30) 2 commits
413
- (merged to 'next' on 2012-06-19 at a42bbcc)
414
- + clone: allow --no-local to turn off local optimizations
415
- + docs/clone: mention that --local may be ignored
416
-
417
-Originally merged to 'next' on 2012-06-05.
418
-
419
-"git clone --local $path" started its life as an experiment to
420
-optionally use link/copy when cloning a repository on the disk, but
421
-we didn't deprecate it after we made the option a no-op to always
422
-use the optimization.
423
-
424
-Will merge to 'master'.
425
-
446
* jk/no-more-asciidoc7 (2012-05-30) 2 commits
447
(merged to 'next' on 2012-06-19 at a36b498)
448
+ docs: drop antique comment from Makefile
@@ -459,7 +479,7 @@ relative URL to its superproject's origin.
479
480
Will merge to 'next'.
481
462
-* mm/push-default-switch-warning (2012-06-06) 1 commit
482
+* mm/push-default-switch-warning (2012-06-20) 1 commit
483
- push: start warning upcoming default change for push.default
484
485
Will merge to 'next'.