What's cooking (2015/07 #07)
Junio C Hamano committed
Jul 27, 2015 at 14:12 UTC
e8f6847178db882bd42d5572439333ca4cb3222e
1 file changed
+163
-97
whats-cooking.txt
+163
-97
@@ -1,26 +1,82 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2015, #06; Tue, 21)
4
-X-master-at: f99a38c0121456822f8a9dfb7928eefceaa98201
5
-X-next-at: 68aafd0cff0775f143dd13a8f2d95a3e65155388
3
+Subject: What's cooking in git.git (Jul 2015, #07; Mon, 27)
4
+X-master-at: a17c56c056d5fea0843b429132904c429a900229
5
+X-next-at: 0029c496ce1b91f10b75ade16604b8e9f5d8d20b
6
7
-What's cooking in git.git (Jul 2015, #06; Tue, 21)
7
+What's cooking in git.git (Jul 2015, #07; Mon, 27)
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
-Tagged v2.5-rc3 today; hopefully we can have an uneventful 2.5 next
15
-week and then start the next cycle. I'll eject/drop the stalled
16
-topics and ask people to reroll/rebase if their topics are still
17
-viable.
14
+Git 2.5 final was tagged and tarballs were pushed out. Accumulated
15
+fixes also went to a new maintenance release 2.4.7. Let's wait and
16
+see for a few days for any regressions before opening the 'master'
17
+branch for topics that have been waiting in 'next', as usual.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
21
22
http://git-blame.blogspot.com/p/git-public-repositories.html
23
24
+--------------------------------------------------
25
+[New Topics]
26
+
27
+* da/subtree-date-confusion (2015-07-23) 1 commit
28
+ - contrib/subtree: ignore log.date configuration
29
+
30
+ "git subtree" (in contrib/) depended on "git log" output to be
31
+ stable, which was a no-no. Apply a workaround to force a
32
+ particular date format.
33
+
34
+ Will merge to 'next'.
35
+
36
+
37
+* db/send-pack-user-signingkey (2015-07-21) 1 commit
38
+ - builtin/send-pack.c: respect user.signingkey
39
+
40
+ The low-level "git send-pack" did not honor 'user.signingkey'
41
+ configuration variable when sending a signed-push.
42
+
43
+ Will merge to 'next'.
44
+
45
+
46
+* jk/refspec-parse-wildcard (2015-07-27) 2 commits
47
+ - refs: loosen restriction on wildcard "*" refspecs
48
+ - refs: cleanup comments regarding check_refname_component()
49
+
50
+ Allow an asterisk as a substring (as opposed to the entirety) of
51
+ a path component for both side of a refspec, e.g.
52
+ "refs/heads/o*:refs/remotes/heads/i*".
53
+
54
+ Will merge to 'next'.
55
+
56
+
57
+* jx/do-not-crash-receive-pack-wo-head (2015-07-22) 1 commit
58
+ - receive-pack: crash when checking with non-exist HEAD
59
+
60
+ Will merge to 'next'.
61
+
62
+
63
+* kd/pull-rebase-autostash (2015-07-22) 1 commit
64
+ - pull: allow dirty tree when rebase.autostash enabled
65
+ (this branch uses pt/pull-builtin; is tangled with pt/am-builtin.)
66
+
67
+ Teach "git pull --rebase" to pay attention to rebase.autostash
68
+ configuration.
69
+
70
+
71
+* es/doc-clean-outdated-tools (2015-07-25) 5 commits
72
+ - Documentation/git-tools: drop references to defunct tools
73
+ - Documentation/git-tools: drop references to defunct tools
74
+ - Documentation/git-tools: fix item text formatting
75
+ - Documentation/git-tools: improve discoverability of Git wiki
76
+ - Documentation/git: drop outdated Cogito reference
77
+
78
+ Will merge to 'next'.
79
+
80
--------------------------------------------------
81
[Stalled]
82
@@ -357,14 +413,14 @@ of the repositories listed at
413
--------------------------------------------------
414
[Cooking]
415
360
-* zb/userdiff-fountain (2015-07-21) 2 commits
361
- - SQUASH???
362
- - userdiff: add support for Fountain documents
416
+* zb/userdiff-fountain (2015-07-23) 1 commit
417
+ (merged to 'next' on 2015-07-23 at e177995)
418
+ + userdiff: add support for Fountain documents
419
420
New userdiff pattern definition for fountain screenwriting markup
421
format.
422
367
- Waiting for a response ($gmane/274403).
423
+ Will merge to 'master'.
424
425
426
* as/sparse-checkout-removal (2015-07-21) 1 commit
@@ -415,36 +471,40 @@ of the repositories listed at
471
Will merge to 'master'.
472
473
418
-* es/worktree-add-cleanup (2015-07-20) 22 commits
419
- - checkout: drop intimate knowledge of newly created worktree
420
- - worktree: populate via "git reset --hard" rather than "git checkout"
421
- - worktree: avoid resolving HEAD unnecessarily
422
- - worktree: make setup of new HEAD distinct from worktree population
423
- - worktree: detect branch-name/detached and error conditions locally
424
- - worktree: add_worktree: construct worktree-population command locally
425
- - worktree: elucidate environment variables intended for child processes
426
- - worktree: make branch creation distinct from worktree population
427
- - worktree: add: suppress auto-vivication with --detach and no <branch>
428
- - worktree: make --detach mutually exclusive with -b/-B
429
- - worktree: introduce options container
430
- - worktree: simplify new branch (-b/-B) option checking
431
- - worktree: improve worktree setup message
432
- - branch: publish die_if_checked_out()
433
- - checkout: teach check_linked_checkout() about symbolic link HEAD
434
- - checkout: check_linked_checkout: simplify symref parsing
435
- - checkout: check_linked_checkout: improve "already checked out" aesthetic
436
- - checkout: generalize die_if_checked_out() branch name argument
437
- - checkout: die_if_checked_out: simplify strbuf management
438
- - checkout: improve die_if_checked_out() robustness
439
- - checkout: name check_linked_checkouts() more meaningfully
440
- - checkout: avoid resolving HEAD unnecessarily
474
+* es/worktree-add-cleanup (2015-07-24) 24 commits
475
+ - Documentation/config: mention "now" and "never" for 'expire' settings
476
+ (merged to 'next' on 2015-07-27 at 25f086d)
477
+ + Documentation/git-worktree: fix broken 'linkgit' invocation
478
+ (merged to 'next' on 2015-07-23 at ecb1e1a)
479
+ + checkout: drop intimate knowledge of newly created worktree
480
+ + worktree: populate via "git reset --hard" rather than "git checkout"
481
+ + worktree: avoid resolving HEAD unnecessarily
482
+ + worktree: make setup of new HEAD distinct from worktree population
483
+ + worktree: detect branch-name/detached and error conditions locally
484
+ + worktree: add_worktree: construct worktree-population command locally
485
+ + worktree: elucidate environment variables intended for child processes
486
+ + worktree: make branch creation distinct from worktree population
487
+ + worktree: add: suppress auto-vivication with --detach and no <branch>
488
+ + worktree: make --detach mutually exclusive with -b/-B
489
+ + worktree: introduce options container
490
+ + worktree: simplify new branch (-b/-B) option checking
491
+ + worktree: improve worktree setup message
492
+ + branch: publish die_if_checked_out()
493
+ + checkout: teach check_linked_checkout() about symbolic link HEAD
494
+ + checkout: check_linked_checkout: simplify symref parsing
495
+ + checkout: check_linked_checkout: improve "already checked out" aesthetic
496
+ + checkout: generalize die_if_checked_out() branch name argument
497
+ + checkout: die_if_checked_out: simplify strbuf management
498
+ + checkout: improve die_if_checked_out() robustness
499
+ + checkout: name check_linked_checkouts() more meaningfully
500
+ + checkout: avoid resolving HEAD unnecessarily
501
(this branch uses es/worktree-add.)
502
503
Remove the "new-worktree-mode" hack in "checkout" that was added in
504
nd/multiple-work-trees topic by updating the implementation of new
505
"worktree add".
506
447
- Will merge to 'next'.
507
+ $gmane/274647
508
509
510
* ib/scripted-parse-opt-better-hint-string (2015-07-15) 1 commit
@@ -547,57 +607,58 @@ of the repositories listed at
607
608
609
* pt/am-builtin (2015-07-20) 46 commits
550
- - builtin-am: remove redirection to git-am.sh
551
- - builtin-am: check for valid committer ident
552
- - builtin-am: implement legacy -b/--binary option
553
- - builtin-am: implement -i/--interactive
554
- - builtin-am: support and auto-detect mercurial patches
555
- - builtin-am: support and auto-detect StGit series files
556
- - builtin-am: support and auto-detect StGit patches
557
- - builtin-am: rerere support
558
- - builtin-am: invoke post-applypatch hook
559
- - builtin-am: invoke pre-applypatch hook
560
- - builtin-am: invoke applypatch-msg hook
561
- - builtin-am: support automatic notes copying
562
- - builtin-am: invoke post-rewrite hook
563
- - builtin-am: implement -S/--gpg-sign, commit.gpgsign
564
- - builtin-am: implement --committer-date-is-author-date
565
- - builtin-am: implement --ignore-date
566
- - builtin-am: pass git-apply's options to git-apply
567
- - builtin-am: implement --[no-]scissors
568
- - builtin-am: support --keep-cr, am.keepcr
569
- - builtin-am: implement --[no-]message-id, am.messageid
570
- - builtin-am: implement -k/--keep, --keep-non-patch
571
- - builtin-am: implement -u/--utf8
572
- - builtin-am: handle stray state directory
573
- - builtin-am: bypass git-mailinfo when --rebasing
574
- - builtin-am: implement --rebasing mode
575
- - builtin-am: implement --3way, am.threeWay
576
- - cache-tree: introduce write_index_as_tree()
577
- - builtin-am: implement -s/--signoff
578
- - builtin-am: exit with user friendly message on failure
579
- - builtin-am: implement -q/--quiet
580
- - builtin-am: reject patches when there's a session in progress
581
- - builtin-am: implement --abort
582
- - builtin-am: implement --skip
583
- - builtin-am: don't parse mail when resuming
584
- - builtin-am: implement --resolved/--continue
585
- - builtin-am: refuse to apply patches if index is dirty
586
- - builtin-am: implement committing applied patch
587
- - builtin-am: apply patch with git-apply
588
- - builtin-am: extract patch and commit info with git-mailinfo
589
- - builtin-am: auto-detect mbox patches
590
- - builtin-am: split out mbox/maildir patches with git-mailsplit
591
- - builtin-am: implement patch queue mechanism
592
- - builtin-am: implement skeletal builtin am
593
- - wrapper: implement xfopen()
594
- - wrapper: implement xopen()
595
- - Merge branch 'pt/pull-builtin' into pt/am-builtin
596
- (this branch uses pt/pull-builtin.)
610
+ (merged to 'next' on 2015-07-23 at d5075f0)
611
+ + builtin-am: remove redirection to git-am.sh
612
+ + builtin-am: check for valid committer ident
613
+ + builtin-am: implement legacy -b/--binary option
614
+ + builtin-am: implement -i/--interactive
615
+ + builtin-am: support and auto-detect mercurial patches
616
+ + builtin-am: support and auto-detect StGit series files
617
+ + builtin-am: support and auto-detect StGit patches
618
+ + builtin-am: rerere support
619
+ + builtin-am: invoke post-applypatch hook
620
+ + builtin-am: invoke pre-applypatch hook
621
+ + builtin-am: invoke applypatch-msg hook
622
+ + builtin-am: support automatic notes copying
623
+ + builtin-am: invoke post-rewrite hook
624
+ + builtin-am: implement -S/--gpg-sign, commit.gpgsign
625
+ + builtin-am: implement --committer-date-is-author-date
626
+ + builtin-am: implement --ignore-date
627
+ + builtin-am: pass git-apply's options to git-apply
628
+ + builtin-am: implement --[no-]scissors
629
+ + builtin-am: support --keep-cr, am.keepcr
630
+ + builtin-am: implement --[no-]message-id, am.messageid
631
+ + builtin-am: implement -k/--keep, --keep-non-patch
632
+ + builtin-am: implement -u/--utf8
633
+ + builtin-am: handle stray state directory
634
+ + builtin-am: bypass git-mailinfo when --rebasing
635
+ + builtin-am: implement --rebasing mode
636
+ + builtin-am: implement --3way, am.threeWay
637
+ + cache-tree: introduce write_index_as_tree()
638
+ + builtin-am: implement -s/--signoff
639
+ + builtin-am: exit with user friendly message on failure
640
+ + builtin-am: implement -q/--quiet
641
+ + builtin-am: reject patches when there's a session in progress
642
+ + builtin-am: implement --abort
643
+ + builtin-am: implement --skip
644
+ + builtin-am: don't parse mail when resuming
645
+ + builtin-am: implement --resolved/--continue
646
+ + builtin-am: refuse to apply patches if index is dirty
647
+ + builtin-am: implement committing applied patch
648
+ + builtin-am: apply patch with git-apply
649
+ + builtin-am: extract patch and commit info with git-mailinfo
650
+ + builtin-am: auto-detect mbox patches
651
+ + builtin-am: split out mbox/maildir patches with git-mailsplit
652
+ + builtin-am: implement patch queue mechanism
653
+ + builtin-am: implement skeletal builtin am
654
+ + wrapper: implement xfopen()
655
+ + wrapper: implement xopen()
656
+ + Merge branch 'pt/pull-builtin' into pt/am-builtin
657
+ (this branch uses pt/pull-builtin; is tangled with kd/pull-rebase-autostash.)
658
659
Rewrite "am" in "C".
660
600
- Will merge to 'next'.
661
+ Still buggy around "am" and then "am -3" workflow.
662
663
664
* ad/bisect-cleanup (2015-06-29) 6 commits
@@ -630,13 +691,14 @@ of the repositories listed at
691
692
693
* dt/refs-backend-preamble (2015-07-21) 7 commits
633
- - git-stash: use update-ref --create-reflog instead of creating files
634
- - update-ref and tag: add --create-reflog arg
635
- - refs: add REF_FORCE_CREATE_REFLOG flag
636
- - git-reflog: add exists command
637
- - refs: new public ref function: safe_create_reflog
638
- - refs: break out check for reflog autocreation
639
- - refs.c: add err arguments to reflog functions
694
+ (merged to 'next' on 2015-07-23 at 9dac423)
695
+ + git-stash: use update-ref --create-reflog instead of creating files
696
+ + update-ref and tag: add --create-reflog arg
697
+ + refs: add REF_FORCE_CREATE_REFLOG flag
698
+ + git-reflog: add exists command
699
+ + refs: new public ref function: safe_create_reflog
700
+ + refs: break out check for reflog autocreation
701
+ + refs.c: add err arguments to reflog functions
702
703
In preparation for allowing different "backends" to store the refs
704
in a way different from the traditional "one ref per file in $GIT_DIR
@@ -644,7 +706,7 @@ of the repositories listed at
706
direct filesystem access to ref-like things like CHERRY_PICK_HEAD
707
from scripts and programs.
708
647
- Will merge to 'next'.
709
+ Will merge to 'master'.
710
711
712
* jk/date-mode-format (2015-07-20) 4 commits
@@ -671,7 +733,7 @@ of the repositories listed at
733
Will merge to 'master'.
734
735
674
-* jc/rerere (2015-07-18) 18 commits
736
+* jc/rerere (2015-07-24) 21 commits
737
- rerere: un-nest merge() further
738
- rerere: use "struct rerere_id" instead of "char *" for conflict ID
739
- rerere: call conflict-ids IDs
@@ -682,22 +744,26 @@ of the repositories listed at
744
- rerere: explain "rerere forget" codepath
745
- rerere: explain the primary codepath
746
- rerere: explain MERGE_RR management helpers
747
+ - rerere: fix benign off-by-one non-bug and clarify code
748
- rerere: explain the rerere I/O abstraction
749
+ - rerere: do not leak mmfile[] for a path with multiple stage #1 entries
750
- rerere: stop looping unnecessarily
751
- rerere: drop want_sp parameter from is_cmarker()
752
- rerere: report autoupdated paths only after actually updating them
753
- rerere: write out each record of MERGE_RR in one go
754
- rerere: lift PATH_MAX limitation
755
- rerere: plug conflict ID leaks
756
+ - rerere: handle conflicts with multiple stage #1 entries
757
- rerere: fix an off-by-one non-bug
758
(this branch is used by jc/rerere-multi.)
759
760
Code clean-up and minor fixes (so far).
761
762
698
-* jc/rerere-multi (2015-07-20) 5 commits
699
- - t4200: rerere a merge with two identical conflicts
700
- - rerere: delay the recording of preimage for the first time
763
+* jc/rerere-multi (2015-07-24) 6 commits
764
+ . t4200: rerere a merge with two identical conflicts
765
+ . WIP
766
+ - rerere: delay the recording of preimage
767
- rerere: handle leftover rr-cache/$ID directory and postimage files
768
- rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id
769
- rerere: split conflict ID further
@@ -910,7 +976,7 @@ of the repositories listed at
976
+ argv-array: implement argv_array_pushv()
977
+ parse-options-cb: implement parse_opt_passthru_argv()
978
+ parse-options-cb: implement parse_opt_passthru()
913
- (this branch is used by pt/am-builtin.)
979
+ (this branch is used by kd/pull-rebase-autostash and pt/am-builtin.)
980
981
Reimplement 'git pull' in C.
982