What's cooking (2015/07 #01)
Junio C Hamano committed
Jul 1, 2015 at 15:36 UTC
3c90de9dbffd6d234467ccb0c7269f31f4e8d7a9
1 file changed
+173
-150
whats-cooking.txt
+173
-150
@@ -1,27 +1,16 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jun 2015, #07; Mon, 29)
4
-X-master-at: 912bd497e93f0235a5999a77f8d54f5ff80a3a03
5
-X-next-at: d595659997efd86e238e50f97b9c8c811b229c4b
3
+Subject: What's cooking in git.git (Jul 2015, #01; Wed, 1)
4
+X-master-at: cbed29f37b690e0a497bd2b6ca9a5bdd7e6ea5aa
5
+X-next-at: 417e6682ab1b640df833193fd7f33c19661721b2
6
7
-What's cooking in git.git (Jun 2015, #07; Mon, 29)
7
+What's cooking in git.git (Jul 2015, #01; Wed, 1)
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
-Some of the topics in flight have overlaps with each other and have
15
-been excluded from 'pu'; most notably, I think the remainder of
16
-bc/object-id needs to wait until the for-each-ref topic from Karthik
17
-settles and then rebased on it, or something.
18
-
19
-A couple of "hotfix" topics that just went into 'next' should be
20
-part of -rc1 early next month, but other than that there aren't
21
-anything ultra-urgent cooking right now. Read those "Will merge to
22
-'master'" as if they were suffixed with "soon after the upcoming
23
-release".
24
-
14
You can find the changes described here in the integration branches
15
of the repositories listed at
16
@@ -30,107 +19,69 @@ of the repositories listed at
19
--------------------------------------------------
20
[Graduated to "master"]
21
33
-* nd/diff-i-t-a (2015-06-23) 1 commit
34
- + Revert "diff-lib.c: adjust position of i-t-a entries in diff"
35
-
36
- The "let's show paths added with -N as 'new' in status output"
37
- change was done without enough consideration on potential fallouts
38
- on the codepaths that do not have anything to do with "status" and
39
- caused regression to at least one widely used "wsadd" alias.
40
-
41
---------------------------------------------------
42
-[New Topics]
43
-
44
-None of these is particularly urgent.
45
-
46
-* dt/refs-backend-preamble (2015-06-29) 7 commits
47
- - git-stash: use git-reflog instead of creating files
48
- - git-reflog: add create and exists functions
49
- - refs: new public ref function: safe_create_reflog
50
- - refs: break out check for reflog autocreation
51
- - bisect: treat BISECT_HEAD as a ref
52
- - cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs
53
- - refs.c: add err arguments to reflog functions
54
-
55
- In preparation for allowing different "backends" to store the refs
56
- in a way different from the traditional "one ref per file in $GIT_DIR
57
- or in a $GIT_DIR/packed-refs file" filesystem storage, reduce
58
- direct filesystem access to ref-like things like CHERRY_PICK_HEAD
59
- from scripts and programs.
22
+* da/mergetool-winmerge (2015-06-19) 1 commit
23
+ (merged to 'next' on 2015-06-24 at 2fb10c4)
24
+ + mergetool-lib: fix default tool selection
25
61
- Will merge to 'next'.
26
+ Hotfix for an earlier change already in 'master' that broke the
27
+ default tool selection for mergetool.
28
29
64
-* et/http-proxyauth (2015-06-29) 1 commit
65
- - http: always use any proxy auth method available
30
+* jc/prompt-document-ps1-state-separator (2015-06-10) 1 commit
31
+ (merged to 'next' on 2015-06-24 at e4d1bad)
32
+ + git-prompt.sh: document GIT_PS1_STATESEPARATOR
33
67
- We used to ask libCURL to use the most secure authentication method
68
- available when talking to an HTTP proxy only when we were told to
69
- talk to one via configuration variables. We now ask libCURL to
70
- always use the most secure authentication method, because the user
71
- can tell libCURL to use an HTTP proxy via an environment variable
72
- without using configuration variables.
34
+ Docfix.
35
74
- Looked sensible. An extra set of eyes appreciated, but I think
75
- this is ready.
36
77
- Will merge to 'next'.
37
+* me/fetch-into-shallow-safety (2015-06-17) 1 commit
38
+ (merged to 'next' on 2015-06-24 at 8ecc19a)
39
+ + fetch-pack: check for shallow if depth given
40
41
+ "git fetch --depth=<depth>" and "git clone --depth=<depth>" issued
42
+ a shallow transfer request even to an upload-pack that does not
43
+ support the capability.
44
80
-* jc/fsck-retire-require-eoh (2015-06-28) 1 commit
81
- - fsck: it is OK for a tag and a commit to lack the body
45
83
- A fix to a minor regression to "git fsck" in v2.2 era that started
84
- complaining about a body-less tag object when it lacks a separator
85
- empty line after its header to separate it with a non-existent body.
46
+* mm/describe-doc (2015-06-16) 1 commit
47
+ (merged to 'next' on 2015-06-24 at 75e34cc)
48
+ + Documentation/describe: improve one-line summary
49
87
- Will merge to 'next'.
50
+ Docfix.
51
52
+--------------------------------------------------
53
+[New Topics]
54
90
-* jk/date-mode-format (2015-06-29) 3 commits
91
- - introduce "format" date-mode
92
- - convert "enum date_mode" into a struct
93
- - show-branch: use DATE_RELATIVE instead of magic number
55
+* jk/rev-list-no-bitmap-while-pruning (2015-07-01) 1 commit
56
+ - rev-list: disable --use-bitmap-index when pruning commits
57
95
- Teach "git log" and friends a new "--date=format:..." option to
96
- format timestamps using system's strftime(3).
58
+ A minor bugfix when pack bitmap was brought in.
59
60
Will merge to 'next'.
61
62
101
-* jk/still-interesting (2015-06-29) 1 commit
102
- - revision.c: remove unneeded check for NULL
103
-
104
- Code clean-up.
63
+* kb/config-unmap-before-renaming (2015-06-30) 1 commit
64
+ - config.c: fix writing config files on Windows network shares
65
66
Will merge to 'next'.
67
68
109
-* nd/export-worktree (2015-06-26) 1 commit
110
- - setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
111
-
112
- Running an aliased command from a subdirectory when the .git thing
113
- in the working tree is a gitfile pointing elsewhere did not work.
69
+* ls/hint-rev-list-count (2015-07-01) 1 commit
70
+ - rev-list: add --count to usage guide
71
72
Will merge to 'next'.
73
74
118
-* sb/p5310-and-chain (2015-06-26) 1 commit
119
- - p5310: Fix broken && chain in performance test
120
-
121
- Code clean-up.
75
+* mh/fast-import-get-mark (2015-07-01) 1 commit
76
+ - fast-import: add a get-mark command
77
78
Will merge to 'next'.
79
80
126
-* jc/rerere (2015-06-28) 5 commits
127
- - rerere: report autoupdated paths only after actually updating them
128
- - rerere: write out each record of MERGE_RR in one go
129
- - rerere: lift PATH_MAX limitation
130
- - t4200: rerere a merge with two identical conflicts
131
- - rerere: fix an off-by-one non-bug
81
+* nd/dwim-wildcards-as-pathspecs (2015-07-01) 1 commit
82
+ - Add tests for wildcard "path vs ref" disambiguation
83
133
- Code clean-up (so far).
84
+ Will merge to 'next' and then to 'master'.
85
86
--------------------------------------------------
87
[Stalled]
@@ -149,18 +100,6 @@ None of these is particularly urgent.
100
Expecting a reroll.
101
102
152
-* kb/i18n-doc (2015-06-15) 1 commit
153
- - Documentation/i18n.txt: clarify character encoding support
154
-
155
- Comments (other than $gmane/271657)?
156
-
157
-
158
-* kb/use-nsec-doc (2015-06-15) 1 commit
159
- - Makefile / racy-git.txt: clarify USE_NSEC prerequisites
160
-
161
- Comments (other than $gmane/271656)?
162
-
163
-
103
* kk/log-merges-config (2015-04-21) 5 commits
104
- bash-completion: add support for git-log --merges= and log.merges
105
- t4202-log: add tests for --merges=
@@ -339,6 +278,117 @@ None of these is particularly urgent.
278
--------------------------------------------------
279
[Cooking]
280
281
+* kb/i18n-doc (2015-07-01) 1 commit
282
+ - Documentation/i18n.txt: clarify character encoding support
283
+
284
+ Will merge to 'next'.
285
+
286
+
287
+* kb/use-nsec-doc (2015-07-01) 1 commit
288
+ - Makefile / racy-git.txt: clarify USE_NSEC prerequisites
289
+
290
+ Will merge to 'next'.
291
+
292
+
293
+* dt/refs-backend-preamble (2015-06-30) 8 commits
294
+ - git-stash: use git-reflog instead of creating files
295
+ - SQUASH???
296
+ - git-reflog: add create and exists functions
297
+ - refs: new public ref function: safe_create_reflog
298
+ - refs: break out check for reflog autocreation
299
+ - bisect: treat BISECT_HEAD as a ref
300
+ - cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs
301
+ - refs.c: add err arguments to reflog functions
302
+
303
+ In preparation for allowing different "backends" to store the refs
304
+ in a way different from the traditional "one ref per file in $GIT_DIR
305
+ or in a $GIT_DIR/packed-refs file" filesystem storage, reduce
306
+ direct filesystem access to ref-like things like CHERRY_PICK_HEAD
307
+ from scripts and programs.
308
+
309
+ Will merge to 'next' after squashing the fix in.
310
+
311
+
312
+* et/http-proxyauth (2015-06-29) 1 commit
313
+ - http: always use any proxy auth method available
314
+
315
+ We used to ask libCURL to use the most secure authentication method
316
+ available when talking to an HTTP proxy only when we were told to
317
+ talk to one via configuration variables. We now ask libCURL to
318
+ always use the most secure authentication method, because the user
319
+ can tell libCURL to use an HTTP proxy via an environment variable
320
+ without using configuration variables.
321
+
322
+ Looked sensible. An extra set of eyes appreciated, but I think
323
+ this is ready.
324
+
325
+ Will merge to 'next'.
326
+
327
+
328
+* jc/fsck-retire-require-eoh (2015-06-28) 1 commit
329
+ - fsck: it is OK for a tag and a commit to lack the body
330
+
331
+ A fix to a minor regression to "git fsck" in v2.2 era that started
332
+ complaining about a body-less tag object when it lacks a separator
333
+ empty line after its header to separate it with a non-existent body.
334
+
335
+ Will merge to 'next'.
336
+
337
+
338
+* jk/date-mode-format (2015-06-29) 3 commits
339
+ - introduce "format" date-mode
340
+ - convert "enum date_mode" into a struct
341
+ - show-branch: use DATE_RELATIVE instead of magic number
342
+
343
+ Teach "git log" and friends a new "--date=format:..." option to
344
+ format timestamps using system's strftime(3).
345
+
346
+ Will merge to 'next'.
347
+
348
+
349
+* jk/still-interesting (2015-06-29) 1 commit
350
+ - revision.c: remove unneeded check for NULL
351
+
352
+ Code clean-up.
353
+
354
+ Will merge to 'next'.
355
+
356
+
357
+* nd/export-worktree (2015-06-26) 1 commit
358
+ - setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR
359
+
360
+ Running an aliased command from a subdirectory when the .git thing
361
+ in the working tree is a gitfile pointing elsewhere did not work.
362
+
363
+ Will merge to 'next'.
364
+
365
+
366
+* sb/p5310-and-chain (2015-06-26) 1 commit
367
+ - p5310: Fix broken && chain in performance test
368
+
369
+ Code clean-up.
370
+
371
+ Will merge to 'next'.
372
+
373
+
374
+* jc/rerere (2015-06-30) 13 commits
375
+ - rerere: refactor "replay" part of do_plain_rerere()
376
+ - rerere: explain the remainder
377
+ - rerere: explain "rerere forget" codepath
378
+ - rerere: explain the primary codepath
379
+ - rerere: explain MERGE_RR management helpers
380
+ - rerere: explain the rerere I/O abstraction
381
+ - rerere: stop looping unnecessarily
382
+ - rerere: drop want_sp parameter from is_cmarker()
383
+ - rerere: report autoupdated paths only after actually updating them
384
+ - rerere: write out each record of MERGE_RR in one go
385
+ - rerere: lift PATH_MAX limitation
386
+ - rerere: plug conflict ID leaks
387
+ - rerere: fix an off-by-one non-bug
388
+
389
+ Code clean-up and minor fixes.
390
+
391
+
392
* ad/bisect-terms (2015-06-29) 10 commits
393
- bisect: allow setting any user-specified in 'git bisect start'
394
- bisect: add 'git bisect terms' to view the current terms
@@ -357,6 +407,11 @@ None of these is particularly urgent.
407
say e.g. "bisect start --term-old=fast --term=new=slow" to find a
408
performance regression.
409
410
+ The bottom part has been quite well cooked. Perhaps split it into
411
+ two topisc and merge the earlier ones to 'next' before the rest
412
+ settles. Michael's idea to make 'good/bad' more intelligent does
413
+ have certain attractiveness ($gname/272867).
414
+
415
416
* mh/tempfile (2015-06-10) 14 commits
417
- credential-cache--daemon: use tempfile module
@@ -420,26 +475,6 @@ None of these is particularly urgent.
475
Will merge to 'next'.
476
477
423
-* me/fetch-into-shallow-safety (2015-06-17) 1 commit
424
- (merged to 'next' on 2015-06-24 at 8ecc19a)
425
- + fetch-pack: check for shallow if depth given
426
-
427
- "git fetch --depth=<depth>" and "git clone --depth=<depth>" issued
428
- a shallow transfer request even to an upload-pack that does not
429
- support the capability.
430
-
431
- Will merge to 'master'.
432
-
433
-
434
-* mm/describe-doc (2015-06-16) 1 commit
435
- (merged to 'next' on 2015-06-24 at 75e34cc)
436
- + Documentation/describe: improve one-line summary
437
-
438
- Docfix.
439
-
440
- Will merge to 'master'.
441
-
442
-
478
* rh/test-color-avoid-terminfo-in-original-home (2015-06-17) 2 commits
479
(merged to 'next' on 2015-06-24 at 6af5fa7)
480
+ test-lib.sh: fix color support when tput needs ~/.terminfo
@@ -518,16 +553,6 @@ None of these is particularly urgent.
553
Will merge to 'master'.
554
555
521
-* da/mergetool-winmerge (2015-06-19) 1 commit
522
- (merged to 'next' on 2015-06-24 at 2fb10c4)
523
- + mergetool-lib: fix default tool selection
524
-
525
- Hotfix for an earlier change already in 'master' that broke the
526
- default tool selection for mergetool.
527
-
528
- Will merge to 'master'.
529
-
530
-
556
* jk/cat-file-batch-all (2015-06-26) 8 commits
557
- cat-file: sort and de-dup output of --batch-all-objects
558
- cat-file: add --batch-all-objects option
@@ -622,7 +647,8 @@ None of these is particularly urgent.
647
other than refs/replace/ for the object replacement data.
648
649
625
-* nd/multiple-work-trees (2015-06-29) 2 commits
650
+* nd/multiple-work-trees (2015-07-01) 3 commits
651
+ - worktree: replace "checkout --to" with "worktree add"
652
(merged to 'next' on 2015-06-29 at fd4eb60)
653
+ worktree: new place for "git prune --worktrees"
654
(merged to 'next' on 2015-06-24 at 7c3f918)
@@ -632,12 +658,12 @@ None of these is particularly urgent.
658
checking if the current branch was checked out elsewhere, when we
659
know we are not switching the branches ourselves.
660
635
- Will merge to 'master'.
661
+ Waiting for a reroll to transition to "worktree add".
662
663
638
-* gp/status-rebase-i-info (2015-06-09) 5 commits
639
- - SQUASH??? fix misindent
664
+* gp/status-rebase-i-info (2015-07-01) 5 commits
665
- status: add new tests for status during rebase -i
666
+ - SQUASH???
667
- status: give more information during rebase -i
668
- status: differentiate interactive from non-interactive rebases
669
- status: factor two rebase-related messages together
@@ -645,16 +671,7 @@ None of these is particularly urgent.
671
Teach "git status" to show a more detailed information regarding
672
the "rebase -i" session in progress.
673
648
- Expecting a reroll.
649
-
650
-
651
-* jc/prompt-document-ps1-state-separator (2015-06-10) 1 commit
652
- (merged to 'next' on 2015-06-24 at e4d1bad)
653
- + git-prompt.sh: document GIT_PS1_STATESEPARATOR
654
-
655
- Docfix.
656
-
657
- Will merge to 'master'.
674
+ Reroll exists; not picked up yet.
675
676
677
* mk/utf8-no-iconv-warn (2015-06-08) 1 commit
@@ -716,11 +733,11 @@ None of these is particularly urgent.
733
Will merge to 'next'.
734
735
719
-* rl/send-email-aliases (2015-06-17) 10 commits
736
+* rl/send-email-aliases (2015-07-01) 10 commits
737
- send-email: suppress meaningless whitespaces in from field
738
- send-email: allow multiple emails using --cc, --to and --bcc
739
- send-email: consider quote as delimiter instead of character
723
- - send-email: reduce dependancies impact on parse_address_line
740
+ - send-email: reduce dependencies impact on parse_address_line
741
- send-email: minor code refactoring
742
- send-email: allow use of aliases in the From field of --compose mode
743
- send-email: refactor address list process
@@ -735,9 +752,7 @@ None of these is particularly urgent.
752
which makes it a bit scary, but as long as it works as designed, it
753
makes it wonderful ;-).
754
738
- This is a lot older version than the latest round ($gmane/272499).
739
- Expecting a reroll.
740
- ($gmane/272517).
755
+ Will merge to 'next'.
756
757
758
* wp/sha1-name-negative-match (2015-06-08) 2 commits
@@ -777,7 +792,7 @@ None of these is particularly urgent.
792
What's the status of this one?
793
794
780
-* gr/rebase-i-drop-warn (2015-06-24) 3 commits
795
+* gr/rebase-i-drop-warn (2015-06-30) 3 commits
796
- git rebase -i: add static check for commands and SHA-1
797
- git rebase -i: warn about removed commits
798
- git-rebase -i: add command "drop" to remove a commit
@@ -787,7 +802,7 @@ None of these is particularly urgent.
802
who do not use it (and instead just remove the lines) by throwing
803
a warning.
804
790
- Need to pick up the latest reroll ($gmane/273009).
805
+ Will merge to 'next'.
806
807
808
* jh/strbuf-read-use-read-in-full (2015-06-01) 1 commit
@@ -829,6 +844,11 @@ None of these is particularly urgent.
844
"git fetch --tags" learned to fetch tags in addition to other stuff
845
a few years ago, but "git push --tags" didn't. Now it does.
846
847
+ A change to push out more than before always invites "what if the
848
+ user makes a mistake" worries.
849
+
850
+ Will discard.
851
+
852
853
* jc/commit-slab (2015-05-22) 1 commit
854
- commit-slab: introduce slabname##_peek() function
@@ -836,11 +856,14 @@ None of these is particularly urgent.
856
Memory use reduction when commit-slab facility is used to annotate
857
sparsely (which is not recommended in the first place).
858
859
+ Will merge to 'next'.
860
+
861
862
* jc/clone-bundle (2015-04-30) 1 commit
863
- repack: optionally create a clone.bundle
864
843
- Still an early WIP
865
+ Waiting for further work.
866
+ Still an early WIP.
867
868
869
* ee/clean-remove-dirs (2015-06-26) 6 commits