What's cooking (2015/09 #04)
Junio C Hamano committed
Sep 17, 2015 at 15:12 UTC
55f6606b96f4da079728cf16c61bca41a0b8f800
1 file changed
+114
-159
whats-cooking.txt
+114
-159
@@ -1,18 +1,17 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Sep 2015, #03; Mon, 14)
4
-X-master-at: f4d9753a89bf04011c00e943d85211906e86a0f6
5
-X-next-at: 924a60862de14449284d454b8dd848b57a8e3f75
3
+Subject: What's cooking in git.git (Sep 2015, #04; Thu, 17)
4
+X-master-at: 0e5767991b19d8f91b437a679196a1dfd678c5a0
5
+X-next-at: 3dd15c02a81a280c83c8d5e32c6cb71a64177ca6
6
7
-What's cooking in git.git (Sep 2015, #03; Mon, 14)
7
+What's cooking in git.git (Sep 2015, #04; Thu, 17)
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
-The tip of 'master' is slightly past 2.6-rc2; hopefully l10n team
15
-can work on this without updates before the end of the cycle.
14
+I'll be offline til Monday 21st, when 2.6-rc3 is planned to happen.
15
16
You can find the changes described here in the integration branches
17
of the repositories listed at
@@ -22,139 +21,15 @@ of the repositories listed at
21
--------------------------------------------------
22
[Graduated to "master"]
23
25
-* ah/show-ref-usage-string (2015-08-31) 1 commit
26
- (merged to 'next' on 2015-09-08 at dc512c8)
27
- + show-ref: place angle brackets around variables in usage string
28
-
29
- Both "git show-ref -h" and "git show-ref --help" illustrated that the
30
- "--exclude-existing" option makes the command read list of refs
31
- from its standard input. Change only the "show-ref -h" output to
32
- have a pair of "<>" around the placeholder that designate an input
33
- file, i.e. "git show-ref --exclude-existing < <ref-list>".
34
-
35
-
36
-* gb/apply-comment-typofix (2015-09-09) 1 commit
37
- (merged to 'next' on 2015-09-09 at 29fb0ff)
38
- + apply: comment grammar fix
39
-
40
-
41
-* jk/pack-protocol-doc (2015-09-03) 1 commit
42
- (merged to 'next' on 2015-09-08 at 98d861d)
43
- + pack-protocol: clarify LF-handling in PKT-LINE()
44
-
45
- Streamline documentation of the pkt-line protocol.
46
-
47
-
48
-* js/maint-am-skip-performance-regression (2015-09-09) 1 commit
49
- (merged to 'next' on 2015-09-14 at b669ea1)
50
- + am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
51
-
52
- Later versions of scripted "git am" has a performance regression in
53
- "git am --skip" codepath, which no longer exists in the built-in
54
- version on the 'master' front. Fix the regression in the last
55
- scripted version that appear in 2.5.x maintenance track and older.
56
-
57
- Will merge to 'maint' and older.
58
-
59
-
60
-* mp/t7060-diff-index-test (2015-09-02) 1 commit
61
- (merged to 'next' on 2015-09-08 at 80ff284)
62
- + t7060: actually test "git diff-index --cached -M"
63
-
64
- Fix an old test that was doing the same thing as another one.
65
-
66
-
67
-* rt/help-strings-fix (2015-09-11) 2 commits
68
- (merged to 'next' on 2015-09-14 at 875908c)
69
- + tag, update-ref: improve description of option "create-reflog"
70
- + pull: don't mark values for option "rebase" for translation
71
-
72
-
73
-* sg/help-group (2015-09-10) 1 commit
74
- (merged to 'next' on 2015-09-14 at cef17e2)
75
- + Makefile: use SHELL_PATH when running generate-cmdlist.sh
76
-
77
- Last minute regression fix.
78
-
79
---------------------------------------------------
80
-[New Topics]
81
-
82
-* ld/p4-detached-head (2015-09-09) 2 commits
83
- - git-p4: work with a detached head
84
- - git-p4: add failing test for submit from detached head
85
-
86
- Will be rerolled.
87
- ($gmane/277574)
88
-
89
-
24
* as/config-doc-markup-fix (2015-09-12) 1 commit
25
(merged to 'next' on 2015-09-14 at faa4134)
26
+ Documentation/config: fix formatting for branch.*.rebase and pull.rebase
27
94
- Will merge to 'master'.
95
-
28
29
* et/win32-poll-timeout (2015-09-14) 1 commit
30
(merged to 'next' on 2015-09-14 at 308dff4)
31
+ poll: honor the timeout on Win32
32
101
- Will merge to 'master'.
102
-
103
-
104
-* jk/graph-format-padding (2015-09-14) 1 commit
105
- - pretty: pass graph width to pretty formatting for use in '%>|(N)'
106
-
107
- Redefine the way '%>|(N)' padding and the "--graph" option
108
- interacts. It has been that the available columns to display the
109
- log message was measured from the edge of the area the graph ended,
110
- but with this it becomes the beginning of the entire output.
111
-
112
- I have a suspicion that 50% of the users would appreciate this
113
- change, and the remainder see this break their expectation. If
114
- that is the case, we might need to introduce a similar but
115
- different alignment operator so that this new behaviour is
116
- available to those who want to use it, without negatively affecting
117
- existing uses.
118
-
119
-
120
-* jk/make-findstring-makeflags-fix (2015-09-10) 1 commit
121
- - Makefile: fix MAKEFLAGS tests with multiple flags
122
-
123
- Customization to change the behaviour with "make -w" and "make -s"
124
- in our Makefile was broken when they were used together.
125
-
126
- Will merge to 'next'.
127
-
128
-
129
-* jk/rebase-no-autostash (2015-09-10) 2 commits
130
- - Documentation/git-rebase: fix --no-autostash formatting
131
- - rebase: support --no-autostash
132
-
133
- There was no way to defeat a configured rebase.autostash variable
134
- from the command line, as "git rebase --no-autostash" was missing.
135
-
136
- Will merge to 'next'.
137
-
138
-
139
-* jw/make-arflags-customizable (2015-09-10) 1 commit
140
- - Makefile: allow $(ARFLAGS) specified from the command line
141
-
142
- The Makefile always runs the library archiver with hardcoded "crs"
143
- options, which was inconvenient for exotic platforms on which
144
- people wants to use programs with totally different set of command
145
- line options.
146
-
147
- Will merge to 'next'.
148
-
149
-
150
-* nd/ignore-then-not-ignore (2015-09-14) 2 commits
151
- - dir.c: don't exclude whole dir prematurely if neg pattern may match
152
- - dir.c: make last_exclude_matching_from_list() run til the end
153
-
154
- Allow a later "!/abc/def" to override an earlier "/abc" that
155
- appears in the same .gitignore file to make it easier to express
156
- "everything in /abc directory is ignored, except for ...".
157
-
33
34
* po/doc-branch-desc (2015-09-14) 1 commit
35
(merged to 'next' on 2015-09-14 at 4934a96)
@@ -163,13 +38,21 @@ of the repositories listed at
38
The branch descriptions that are set with "git branch --edit-description"
39
option were used in many places but they weren't clearly documented.
40
166
- Will merge to 'master'.
41
+--------------------------------------------------
42
+[New Topics]
43
44
+* jk/blame-first-parent (2015-09-16) 1 commit
45
+ - blame: handle --first-parent
46
+
47
+
48
+* jk/transfer-limit-protocol (2015-09-16) 3 commits
49
+ - SQUASH???
50
+ - submodule: allow only certain protocols for submodule fetches
51
+ - transport: add a protocol-whitelist environment variable
52
169
-* sb/submodule-parallel-fetch (2015-09-14) 2 commits
170
- - fetch: fetch submodules in parallel
171
- - submodule.c: write "Fetching submodule <foo>" to stderr
172
- (this branch uses sb/submodule-helper.)
53
+
54
+* rj/mailmap-ramsay (2015-09-16) 1 commit
55
+ - mailmap: update my entry with new email address
56
57
--------------------------------------------------
58
[Stalled]
@@ -397,6 +280,75 @@ of the repositories listed at
280
--------------------------------------------------
281
[Cooking]
282
283
+* ld/p4-detached-head (2015-09-09) 2 commits
284
+ - git-p4: work with a detached head
285
+ - git-p4: add failing test for submit from detached head
286
+
287
+ Will be rerolled.
288
+ ($gmane/277574)
289
+
290
+
291
+* jk/graph-format-padding (2015-09-14) 1 commit
292
+ - pretty: pass graph width to pretty formatting for use in '%>|(N)'
293
+
294
+ Redefine the way '%>|(N)' padding and the "--graph" option
295
+ interacts. It has been that the available columns to display the
296
+ log message was measured from the edge of the area the graph ended,
297
+ but with this it becomes the beginning of the entire output.
298
+
299
+ I have a suspicion that 50% of the users would appreciate this
300
+ change, and the remainder see this break their expectation. If
301
+ that is the case, we might need to introduce a similar but
302
+ different alignment operator so that this new behaviour is
303
+ available to those who want to use it, without negatively affecting
304
+ existing uses.
305
+
306
+
307
+* jk/make-findstring-makeflags-fix (2015-09-10) 1 commit
308
+ - Makefile: fix MAKEFLAGS tests with multiple flags
309
+
310
+ Customization to change the behaviour with "make -w" and "make -s"
311
+ in our Makefile was broken when they were used together.
312
+
313
+ Will merge to 'next'.
314
+
315
+
316
+* jk/rebase-no-autostash (2015-09-10) 2 commits
317
+ - Documentation/git-rebase: fix --no-autostash formatting
318
+ - rebase: support --no-autostash
319
+
320
+ There was no way to defeat a configured rebase.autostash variable
321
+ from the command line, as "git rebase --no-autostash" was missing.
322
+
323
+ Will merge to 'next'.
324
+
325
+
326
+* jw/make-arflags-customizable (2015-09-10) 1 commit
327
+ - Makefile: allow $(ARFLAGS) specified from the command line
328
+
329
+ The Makefile always runs the library archiver with hardcoded "crs"
330
+ options, which was inconvenient for exotic platforms on which
331
+ people wants to use programs with totally different set of command
332
+ line options.
333
+
334
+ Will merge to 'next'.
335
+
336
+
337
+* nd/ignore-then-not-ignore (2015-09-14) 2 commits
338
+ - dir.c: don't exclude whole dir prematurely if neg pattern may match
339
+ - dir.c: make last_exclude_matching_from_list() run til the end
340
+
341
+ Allow a later "!/abc/def" to override an earlier "/abc" that
342
+ appears in the same .gitignore file to make it easier to express
343
+ "everything in /abc directory is ignored, except for ...".
344
+
345
+
346
+* sb/submodule-parallel-fetch (2015-09-14) 2 commits
347
+ - fetch: fetch submodules in parallel
348
+ - submodule.c: write "Fetching submodule <foo>" to stderr
349
+ (this branch uses sb/submodule-helper.)
350
+
351
+
352
* mk/submodule-gitdir-path (2015-09-14) 2 commits
353
- path: implement common_dir handling in git_pathdup_submodule()
354
- submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
@@ -559,7 +511,9 @@ of the repositories listed at
511
Will merge to 'master'.
512
513
562
-* ls/p4-path-encoding (2015-09-03) 1 commit
514
+* ls/p4-path-encoding (2015-09-16) 2 commits
515
+ (merged to 'next' on 2015-09-17 at 7f8b9e0)
516
+ + git-p4: improve path encoding verbose output
517
(merged to 'next' on 2015-09-08 at 56514f9)
518
+ git-p4: add config git-p4.pathEncoding
519
@@ -611,29 +565,31 @@ of the repositories listed at
565
Will merge to 'master'.
566
567
614
-* kn/for-each-tag (2015-09-11) 16 commits
615
- - tag.c: implement '--merged' and '--no-merged' options
616
- - tag.c: implement '--format' option
617
- - tag.c: use 'ref-filter' APIs
618
- - tag.c: use 'ref-filter' data structures
619
- - ref-filter: add option to match literal pattern
620
- - ref-filter: add support to sort by version
621
- - ref-filter: add support for %(contents:lines=X)
622
- - ref-filter: add option to filter out tags, branches and remotes
623
- - ref-filter: implement an `align` atom
624
- - ref-filter: introduce match_atom_name()
625
- - ref-filter: introduce handler function for each atom
626
- - utf8: add function to align a string into given strbuf
627
- - ref-filter: introduce ref_formatting_state and ref_formatting_stack
628
- - ref-filter: move `struct atom_value` to ref-filter.c
629
- - Merge 'jk/git-path' into kn/for-each-tag
630
- - Merge 'kn/for-each-tag-branch' into kn/for-each-tag
568
+* kn/for-each-tag (2015-09-17) 17 commits
569
+ (merged to 'next' on 2015-09-17 at 1980952)
570
+ + tag.c: implement '--merged' and '--no-merged' options
571
+ + tag.c: implement '--format' option
572
+ + tag.c: use 'ref-filter' APIs
573
+ + tag.c: use 'ref-filter' data structures
574
+ + ref-filter: add option to match literal pattern
575
+ + ref-filter: add support to sort by version
576
+ + ref-filter: add support for %(contents:lines=X)
577
+ + ref-filter: add option to filter out tags, branches and remotes
578
+ + ref-filter: implement an `align` atom
579
+ + ref-filter: introduce match_atom_name()
580
+ + ref-filter: introduce handler function for each atom
581
+ + utf8: add function to align a string into given strbuf
582
+ + ref-filter: introduce ref_formatting_state and ref_formatting_stack
583
+ + ref-filter: move `struct atom_value` to ref-filter.c
584
+ + strtoul_ui: reject negative values
585
+ + Merge 'jk/git-path' into kn/for-each-tag
586
+ + Merge 'kn/for-each-tag-branch' into kn/for-each-tag
587
(this branch uses kn/for-each-tag-branch.)
588
589
The "ref-filter" code was taught about many parts of what "tag -l"
590
does and then "tag -l" is reimplemented in terms of "ref-filter".
591
636
- Will merge to 'next'.
592
+ Will merge to 'master'.
593
594
595
* nd/ita-cleanup (2015-09-06) 6 commits
@@ -663,14 +619,13 @@ of the repositories listed at
619
Waiting for a reroll.
620
621
666
-* bb/remote-get-url (2015-09-04) 1 commit
622
+* bb/remote-get-url (2015-09-17) 1 commit
623
- remote: add get-url subcommand
624
625
"git remote" learned "get-url" subcommand to show the URL for a
626
given remote name used for fetching and pushing.
627
672
- Waiting for a reroll.
673
- ($gmane/277313)
628
+ Will merge to 'next'.
629
630
631
* sb/submodule-helper (2015-09-08) 4 commits
@@ -750,9 +705,9 @@ of the repositories listed at
705
Will merge to 'master'.
706
707
753
-* jc/rerere-multi (2015-09-11) 7 commits
708
+* jc/rerere-multi (2015-09-14) 7 commits
709
+ - rerere: do use multiple variants
710
- t4200: rerere a merge with two identical conflicts
755
- - WIP
711
- rerere: allow multiple variants to exist
712
- rerere: delay the recording of preimage
713
- rerere: handle leftover rr-cache/$ID directory and postimage files