What's cooking (2014/02 #03)
Junio C Hamano committed
Feb 7, 2014 at 12:46 UTC
cdb2b5ef50d75edb9e70f1852081808e648df337
1 file changed
+161
-158
whats-cooking.txt
+161
-158
@@ -1,17 +1,22 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Feb 2014, #02; Wed, 5)
4
-X-master-at: 89ba81dc7643f5b126b15b15a8dcd3893d05ee47
5
-X-next-at: ed4ee9f6d9847e9cfc1ea6faeea20ae612ccbcfb
3
+Subject: What's cooking in git.git (Feb 2014, #03; Fri, 7)
4
+X-master-at: 6a7071958620dadcce84e4faaa470407ae3d4108
5
+X-next-at: 34970086681ea5b5ca7b0bdca6356de6004e0245
6
7
-What's cooking in git.git (Feb 2014, #02; Wed, 5)
7
+What's cooking in git.git (Feb 2014, #03; Fri, 7)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
11
'-' are only in 'pu' (proposed updates) while commits prefixed with
12
'+' are in 'next'.
13
14
-v1.9.0-rc3 is expected to happen this weekend or early next week.
14
+The tip of 'master' has been tagged as v1.9.0-rc3. As a workaround
15
+to make life easier for third-party tools, the upcoming major
16
+release will be called "Git 1.9.0" (not "Git 1.9"). The first
17
+maintenance release for it will be "Git 1.9.1", and the major
18
+release after "Git 1.9.0" will either be "Git 2.0.0" or "Git
19
+1.10.0".
20
21
You can find the changes described here in the integration branches
22
of the repositories listed at
@@ -19,92 +24,56 @@ of the repositories listed at
24
http://git-blame.blogspot.com/p/git-public-repositories.html
25
26
--------------------------------------------------
22
-[New Topics]
27
+[Graduated to "master"]
28
29
* aj/ada-diff-word-pattern (2014-02-05) 1 commit
25
- - userdiff: update Ada patterns
26
-
27
- Will merge to 'next' and then to 'master'.
28
-
29
-
30
-* jk/makefile (2014-02-05) 16 commits
31
- - FIXUP
32
- - move LESS/LV pager environment to Makefile
33
- - Makefile: teach scripts to include make variables
34
- - FIXUP
35
- - Makefile: auto-build C strings from make variables
36
- - Makefile: drop *_SQ variables
37
- - FIXUP
38
- - Makefile: add c-quote helper function
39
- - Makefile: introduce sq function for shell-quoting
40
- - Makefile: always create files via make-var
41
- - Makefile: store GIT-* sentinel files in MAKE/
42
- - Makefile: prefer printf to echo for GIT-*
43
- - Makefile: use tempfile/mv strategy for GIT-*
44
- - Makefile: introduce make-var helper function
45
- - Makefile: fix git-instaweb dependency on gitweb
46
- - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
47
-
48
-
49
-* ks/tree-diff-walk (2014-02-05) 4 commits
50
- - revision: convert to using diff_tree_sha1()
51
- - line-log: convert to using diff_tree_sha1()
52
- - tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old=NULL
53
- - tree-diff: allow diff_tree_sha1 to accept NULL sha1
54
-
55
- Will merge to 'next'.
56
-
57
-
58
-* nd/reset-intent-to-add (2014-02-05) 1 commit
59
- - reset: support "--mixed --intent-to-add" mode
60
-
61
- Will merge to 'next'.
30
+ (merged to 'next' on 2014-02-06 at 8062b22)
31
+ + userdiff: update Ada patterns
32
33
34
* nd/tag-doc (2014-02-04) 1 commit
65
- - git-tag.txt: <commit> for --contains is optional
66
-
67
- Will merge to 'next' and then to 'master'.
35
+ (merged to 'next' on 2014-02-06 at 9f02991)
36
+ + git-tag.txt: <commit> for --contains is optional
37
38
70
-* nd/test-rename-reset (2014-02-04) 1 commit
71
- - t7101, t7014: rename test files to indicate what that file is for
72
-
73
- Will merge to 'next'.
74
-
75
-
76
-* tb/repack-fix-renames (2014-02-05) 1 commit
77
- - repack.c: rename a few variables
78
-
79
- Perhaps unneeded, as the longer-term plan is to drop the codeblock
80
- this change touches.
81
-
82
- Will discard.
39
+* ow/manpages-typofix (2014-02-05) 1 commit
40
+ (merged to 'next' on 2014-02-06 at b482b8f)
41
+ + Documentation: fix typos in man pages
42
43
+--------------------------------------------------
44
+[New Topics]
45
85
-* tr/remerge-diff (2014-02-05) 6 commits
86
- - log --remerge-diff: show what the conflict resolution changed
87
- - merge-recursive: allow storing conflict hunks in index
88
- - Fold all merge diff variants into an enum
89
- - combine-diff: do not pass revs->dense_combined_merges redundantly
90
- - log: add a merge base inspection option
91
- - pretty: refactor add_merge_info() into parts
92
- (this branch uses tr/merge-recursive-index-only.)
46
+* jc/check-attr-honor-working-tree (2014-02-06) 2 commits
47
+ - check-attr: move to the top of working tree when in non-bare repository
48
+ - t0003: do not chdir the whole test process
49
94
- "log -p" output learns a new way to let users inspect a merge
95
- commit by showing the differences between the automerged result
96
- with conflicts the person who recorded the merge would have seen
97
- and the final conflict resolution that was recorded in the merge.
50
+ "git check-attr" when (trying to) work on a repository with a
51
+ working tree did not work well when the working tree was specified
52
+ via --work-tree (and obviously with --git-dir).
53
99
- RFC.
54
+ The command also works in a bare repository but it reads from the
55
+ (possibly stale, irrelevant and/or nonexistent) index, which may
56
+ need to be fixed to read from HEAD, but that is a completely
57
+ separate issue. As a related tangentto this separate issue, we may
58
+ want to also fix "check-ignore", which refuses to work in a bare
59
+ repository, to also operate in a bare one.
60
61
102
-* ow/manpages-typofix (2014-02-05) 1 commit
103
- - Documentation: fix typos in man pages
62
+* nd/http-fetch-shallow-fix (2014-02-07) 6 commits
63
+ - fetch-pack: fix deepen shallow over smart http with no-done cap
64
+ - protocol-capabilities.txt: document no-done
65
+ - protocol-capabilities.txt: refer multi_ack_detailed back to pack-protocol.txt
66
+ - pack-protocol.txt: clarify 'obj-id' in the last ACK after 'done'
67
+ - t5538: fix default http port
68
+ - test: rename http fetch and push test files
69
105
- Various typofixes, all looked correct.
70
+ Attempting to deepen a shallow repository by fetching over smart
71
+ HTTP transport failed in the protocol exchange, when no-done
72
+ extension was used. The fetching side waited for the list of
73
+ shallow boundary commits after the sending end stopped talking to
74
+ it.
75
107
- Will merge to 'next' and then to 'master'.
76
+ Will merge to 'next'.
77
78
--------------------------------------------------
79
[Stalled]
@@ -132,6 +101,8 @@ of the repositories listed at
101
a triangular workflow by introducing B@{publish} that works in a
102
similar way to how B@{upstream} does.
103
104
+ Meant to be used as a basis for whatever Ram wants to build on.
105
+
106
Will hold.
107
108
@@ -179,8 +150,10 @@ of the repositories listed at
150
ref mapping and ref deletion in a way similar to the natively
151
supported transports.
152
182
- Reported to break t5541.
183
- Will hold.
153
+ Reported to break t5541, and has been stalled for a while without
154
+ fixes.
155
+
156
+ Will discard.
157
158
159
* fc/completion (2013-12-09) 1 commit
@@ -189,7 +162,10 @@ of the repositories listed at
162
SZEDER Gábor noticed that this breaks "git -c var=val alias" and
163
also suggested a better description of the change.
164
192
- Will hold.
165
+ Has been stalled for a while without much comments from anybody
166
+ interested.
167
+
168
+ Will discard.
169
170
171
* mo/subtree-split-updates (2013-12-10) 3 commits
@@ -197,7 +173,10 @@ of the repositories listed at
173
- subtree: allow --squash and --message with push
174
- subtree: support split --rejoin --squash
175
200
- Comments?
176
+ Has been stalled for a while without much comments from anybody
177
+ interested.
178
+
179
+ Will discard.
180
181
182
* hv/submodule-ignore-fix (2013-12-06) 4 commits
@@ -257,7 +236,7 @@ of the repositories listed at
236
Of unknown value until tested on non-Linux platforms (especially
237
Windows).
238
260
- Will hold.
239
+ Will discard.
240
241
242
* jt/commit-fixes-footer (2013-10-30) 1 commit
@@ -324,6 +303,8 @@ of the repositories listed at
303
304
I am not sure if that is solving a right problem, though.
305
306
+ Will discard.
307
+
308
309
* rv/send-email-cache-generated-mid (2013-08-21) 2 commits
310
- git-send-email: Cache generated message-ids, use them when prompting
@@ -363,8 +344,10 @@ of the repositories listed at
344
345
Various fixes to gitweb.
346
366
- Drew Northup volunteered to take a look into this.
367
- $gmane/226216
347
+ Drew Northup volunteered to take a look into this ($gmane/226216)
348
+ but nothing seems to have happened since then.
349
+
350
+ Will discard.
351
352
353
* jc/show-branch (2013-06-07) 5 commits
@@ -379,6 +362,82 @@ of the repositories listed at
362
--------------------------------------------------
363
[Cooking]
364
365
+* jk/makefile (2014-02-05) 16 commits
366
+ - FIXUP
367
+ - move LESS/LV pager environment to Makefile
368
+ - Makefile: teach scripts to include make variables
369
+ - FIXUP
370
+ - Makefile: auto-build C strings from make variables
371
+ - Makefile: drop *_SQ variables
372
+ - FIXUP
373
+ - Makefile: add c-quote helper function
374
+ - Makefile: introduce sq function for shell-quoting
375
+ - Makefile: always create files via make-var
376
+ - Makefile: store GIT-* sentinel files in MAKE/
377
+ - Makefile: prefer printf to echo for GIT-*
378
+ - Makefile: use tempfile/mv strategy for GIT-*
379
+ - Makefile: introduce make-var helper function
380
+ - Makefile: fix git-instaweb dependency on gitweb
381
+ - Makefile: drop USE_GETTEXT_SCHEME from GIT-CFLAGS
382
+
383
+ Simplify the Makefile rules and macros that exist primarily for
384
+ quoting purposes, and make it easier to robustly express the
385
+ dependency rules.
386
+
387
+ Expecting a reroll.
388
+
389
+
390
+* ks/tree-diff-walk (2014-02-06) 5 commits
391
+ (merged to 'next' on 2014-02-06 at d56a3be)
392
+ + Finally switch over tree descriptors to contain a pre-parsed entry
393
+ + revision: convert to using diff_tree_sha1()
394
+ + line-log: convert to using diff_tree_sha1()
395
+ + tree-diff: convert diff_root_tree_sha1() to just call diff_tree_sha1 with old=NULL
396
+ + tree-diff: allow diff_tree_sha1 to accept NULL sha1
397
+
398
+ Will cook in 'next'.
399
+
400
+
401
+* nd/reset-intent-to-add (2014-02-05) 1 commit
402
+ (merged to 'next' on 2014-02-07 at 3497008)
403
+ + reset: support "--mixed --intent-to-add" mode
404
+
405
+ Will cook in 'next'.
406
+
407
+
408
+* nd/test-rename-reset (2014-02-04) 1 commit
409
+ (merged to 'next' on 2014-02-06 at ca188bd)
410
+ + t7101, t7014: rename test files to indicate what that file is for
411
+
412
+ Will cook in 'next'.
413
+
414
+
415
+* tb/repack-fix-renames (2014-02-05) 1 commit
416
+ - repack.c: rename a few variables
417
+
418
+ Perhaps unneeded, as the longer-term plan is to drop the codeblock
419
+ this change touches.
420
+
421
+ Will discard.
422
+
423
+
424
+* tr/remerge-diff (2014-02-05) 6 commits
425
+ - log --remerge-diff: show what the conflict resolution changed
426
+ - merge-recursive: allow storing conflict hunks in index
427
+ - Fold all merge diff variants into an enum
428
+ - combine-diff: do not pass revs->dense_combined_merges redundantly
429
+ - log: add a merge base inspection option
430
+ - pretty: refactor add_merge_info() into parts
431
+ (this branch uses tr/merge-recursive-index-only.)
432
+
433
+ "log -p" output learns a new way to let users inspect a merge
434
+ commit by showing the differences between the automerged result
435
+ with conflicts the person who recorded the merge would have seen
436
+ and the final conflict resolution that was recorded in the merge.
437
+
438
+ RFC.
439
+
440
+
441
* bs/stdio-undef-before-redef (2014-01-31) 1 commit
442
(merged to 'next' on 2014-01-31 at 9874918)
443
+ git-compat-util.h: #undef (v)snprintf before #define them
@@ -407,25 +466,23 @@ of the repositories listed at
466
467
468
* mw/symlinks (2014-02-04) 6 commits
410
- - setup: don't dereference in-tree symlinks for absolute paths
411
- - setup: add abspath_part_inside_repo() function
412
- - t0060: add tests for prefix_path when path begins with work tree
413
- - t0060: add test for prefix_path when path == work tree
414
- - t0060: add test for prefix_path on symlinks via absolute paths
415
- - t3004: add test for ls-files on symlinks via absolute paths
469
+ (merged to 'next' on 2014-02-06 at 3d6df37)
470
+ + setup: don't dereference in-tree symlinks for absolute paths
471
+ + setup: add abspath_part_inside_repo() function
472
+ + t0060: add tests for prefix_path when path begins with work tree
473
+ + t0060: add test for prefix_path when path == work tree
474
+ + t0060: add test for prefix_path on symlinks via absolute paths
475
+ + t3004: add test for ls-files on symlinks via absolute paths
476
477
All subcommands that take pathspecs mishandled an in-tree symbolic
478
link when given it as a full path from the root (which arguably is
479
a sick way to use pathspecs). "git ls-files -s $(pwd)/RelNotes" in
480
our tree is an easy reproduction recipe.
481
422
- We may want to add tests to illustrate symptoms that are visible to
423
- the end user, but the updated code looked reasonable.
424
-
425
- Will merge to 'next'.
482
+ Will cook in 'next'.
483
484
428
-* ks/diff-c-with-diff-order-more (2014-02-05) 5 commits
485
+* ks/combine-diff (2014-02-05) 5 commits
486
- combine-diff: move changed-paths scanning logic into its own function
487
- combine-diff: move show_log_first logic/action out of paths scanning
488
- tree-diff: no need to pass match to skip_uninteresting()
@@ -437,9 +494,8 @@ of the repositories listed at
494
revision and each of its N parents, combine-diff can be sped up
495
significantly.
496
440
- Not quite sure if we want another custom tree walker for it, or it
441
- should be written by using existing two-way diff with the result of
442
- earlier intersect_path() as pathspec.
497
+ Will merge to 'next' after reading it over one more time.
498
+ Help in reviewing the series is very much appreciated.
499
500
501
* bc/gpg-sign-everywhere (2014-02-03) 9 commits
@@ -545,27 +601,22 @@ of the repositories listed at
601
Will cook in 'next'.
602
603
548
-* cc/interpret-trailers (2014-01-27) 17 commits
604
+* cc/interpret-trailers (2014-02-06) 14 commits
605
- Documentation: add documentation for 'git interpret-trailers'
606
- trailer: add tests for commands using env variables
607
- trailer: set author and committer env variables
608
- trailer: add tests for trailer command
609
- trailer: execute command from 'trailer.<name>.command'
554
- - strbuf: add strbuf_replace()
555
- - trailer: add new_trailer_item() function
610
- trailer: if no input file is passed, read from stdin
611
- trailer: add tests for "git interpret-trailers"
612
- trailer: add interpret-trailers command
613
- trailer: put all the processing together and print
614
- trailer: parse trailers from input file
561
- - strbuf: add strbuf_isspace()
615
- trailer: process command line trailer arguments
616
- trailer: read and process config information
617
- trailer: process trailers from file and arguments
618
- Add data structures and basic functions for commit trailers
619
567
- Waiting for a reroll.
568
-
620
621
* dk/blame-janitorial (2014-01-22) 2 commits
622
(merged to 'next' on 2014-01-29 at 0b7ea97)
@@ -584,7 +635,7 @@ of the repositories listed at
635
+ combine-diff: optimize combine_diff_path sets intersection
636
+ diff test: add tests for combine-diff with orderfile
637
+ diffcore-order: export generic ordering interface
587
- (this branch is used by ks/diff-c-with-diff-order-more.)
638
+ (this branch is used by ks/combine-diff.)
639
640
Teach combine-diff to honour the path-output-order imposed by
641
diffcore-order.
@@ -620,16 +671,17 @@ of the repositories listed at
671
672
673
* wk/submodule-on-branch (2014-01-27) 4 commits
623
- - Documentation: Describe 'submodule update --remote' use case
624
- - submodule: Explicit local branch creation in module_clone
625
- - submodule: Document module_clone arguments in comments
626
- - submodule: Make 'checkout' update_module explicit
674
+ (merged to 'next' on 2014-02-06 at 03dc3fd)
675
+ + Documentation: Describe 'submodule update --remote' use case
676
+ + submodule: Explicit local branch creation in module_clone
677
+ + submodule: Document module_clone arguments in comments
678
+ + submodule: Make 'checkout' update_module explicit
679
680
Makes sure 'submodule update' modes that do not detach HEADs can
681
be used more pleasantly by checking out a concrete branch when
682
cloning them to prime the well.
683
632
- Will merge to 'next'.
684
+ Will cook in 'next'.
685
686
687
* jk/warn-on-object-refname-ambiguity (2014-01-09) 6 commits
@@ -772,52 +824,3 @@ of the repositories listed at
824
+ diff: remove "diff-files -q" in a version of Git in a distant future
825
826
Will cook in 'next' until a distant future.
775
-
776
---------------------------------------------------
777
-[Discarded]
778
-
779
-* jk/branch-at-publish (2014-01-23) 6 commits
780
- . t1507 (rev-parse-upstream): fix typo in test title
781
- . implement @{publish} shorthand
782
- . branch_get: provide per-branch pushremote pointers
783
- . branch_get: return early on error
784
- . interpret_branch_name: factor out upstream handling
785
- . sha1_name: refactor upstream_mark
786
-
787
- Rebased to be jk/branch-at-publish-rebased to share the same change
788
- with the jk/interpret-branch-name-fix topic.
789
-
790
-
791
-* jn/git-gui-chmod+x (2013-11-25) 1 commit
792
- . git-gui: chmod +x po2msg, windows/git-gui.sh
793
-
794
- Now in 'master' from the upstream git-gui repository.
795
-
796
-
797
-* jn/gitk-chmod+x (2013-11-25) 1 commit
798
- . gitk: chmod +x po2msg
799
-
800
- Now in 'master' from the upstream gitk repository.
801
-
802
-
803
-* jc/parse-options-humint (2014-01-22) 1 commit
804
- . parse-options: refactor human-friendly-integer parser out of pack-objects
805
-
806
- Teach parse-options machinery to optionally parse numbers with a
807
- unit suffix, e.g. 8g, 4m, 128k.
808
-
809
-
810
-* jk/color-for-more-pagers (2014-01-17) 4 commits
811
- . pager: disable colors for some known-bad configurations
812
- . DONOTMERGE: needs matching change to git-sh-setup
813
- . setup_pager: set MORE=R
814
- . setup_pager: refactor LESS/LV environment setting
815
-
816
- 'more' implementation of BSD wants to be told with MORE=R
817
- environment before it shows colored output, while 'more' on some
818
- other platforms will die when seeing MORE=R environment. But the
819
- consensus is that trying to be too intimately knowledgeable about
820
- quirks of various pager implementations on different platforms is a
821
- losing proposition.
822
-
823
- Will be superseded by jk/makefile series when it matures.