What's cooking (2016/09 #01)
Junio C Hamano committed
Sep 2, 2016 at 19:10 UTC
0742b8c56e92de01d9324e57eef3c39e17800e6c
1 file changed
+110
-146
whats-cooking.txt
+110
-146
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2016, #09; Wed, 31)
4
-X-master-at: 5b18e70009487bb156cac18546d6f91105338f4c
5
-X-next-at: 775ea9aab9ac658f12f52eef7b42ae8064dd56dd
3
+Subject: What's cooking in git.git (Sep 2016, #01; Fri, 2)
4
+X-master-at: 6ebdac1bab966b720d776aa43ca188fe378b1f4b
5
+X-next-at: f2ff48496e8dc270b21b0290a2a3e4ef98e352ed
6
7
-What's cooking in git.git (Aug 2016, #09; Wed, 31)
7
+What's cooking in git.git (Sep 2016, #01; Fri, 2)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,6 +12,13 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
+Git 2.10 has been tagged. In a few days, many topics that have been
16
+cooking in 'next' would be merged to 'master'; as usual, I plan to
17
+keep the tip of 'next' closed for a week or so and encourage people
18
+to pay more attention to possible regressions than to show their
19
+shiny new toys, and then open the new cycle by rebuilding 'next'
20
+after that.
21
+
22
You can find the changes described here in the integration branches
23
of the repositories listed at
24
@@ -20,135 +27,23 @@ of the repositories listed at
27
--------------------------------------------------
28
[New Topics]
29
23
-* bh/diff-highlight-graph (2016-08-31) 6 commits
24
- (merged to 'next' on 2016-08-31 at 523a15f)
25
- + diff-highlight: avoid highlighting combined diffs
26
- + diff-highlight: add multi-byte tests
27
- + diff-highlight: ignore test cruft
28
- + diff-highlight: add support for --graph output
29
- + diff-highlight: add failing test for handling --graph output
30
- + diff-highlight: add some tests
31
-
32
- "diff-highlight" script (in contrib/) learned to work better with
33
- "git log -p --graph" output.
30
+* jc/submodule-anchor-git-dir (2016-09-01) 1 commit
31
+ - submodule: avoid auto-discovery in prepare_submodule_repo_env()
32
35
- Will keep in 'next' during the rest of the cycle.
33
+ Having a submodule whose ".git" repository is somehow corrupt
34
+ caused a few commands that recurse into submodules loop forever.
35
36
+ Will merge to 'next'.
37
38
-* jc/am-read-author-file (2016-08-30) 1 commit
39
- - am: refactor read_author_script()
40
-
41
- Extract a small helper out of the function that reads the authors
42
- script file "git am" internally uses.
43
-
44
-
45
-* jk/test-lib-drop-pid-from-results (2016-08-30) 1 commit
46
- - test-lib: drop PID from test-results/*.count
47
-
48
- The test framework left the number of tests and success/failure
49
- count in the t/test-results directory, keyed by the name of the
50
- test script plus the process ID. The latter however turned out not
51
- to serve any useful purpose. The process ID part of the filename
52
- has been removed.
53
-
54
- Will hold for a bit more and then merge to 'next'.
55
-
56
-
57
-* js/sequencer-wo-die (2016-08-29) 14 commits
58
- - sequencer: lib'ify save_opts()
59
- - sequencer: lib'ify save_todo()
60
- - sequencer: lib'ify save_head()
61
- - sequencer: lib'ify create_seq_dir()
62
- - sequencer: lib'ify read_populate_opts()
63
- - sequencer: lib'ify read_populate_todo()
64
- - sequencer: lib'ify read_and_refresh_cache()
65
- - sequencer: lib'ify prepare_revs()
66
- - sequencer: lib'ify walk_revs_populate_todo()
67
- - sequencer: lib'ify do_pick_commit()
68
- - sequencer: lib'ify do_recursive_merge()
69
- - sequencer: lib'ify write_message()
70
- - sequencer: do not die() in do_pick_commit()
71
- - sequencer: lib'ify sequencer_pick_revisions()
72
-
73
- Lifts calls to exit(2) and die() higher in the callchain in
74
- sequencer.c files so that more helper functions in it can be used
75
- by callers that want to handle error conditions themselves.
38
77
- Waiting for the review discussion to settle.
39
+* jc/forbid-symbolic-ref-d-HEAD (2016-09-02) 1 commit
40
+ - symbolic-ref -d: do not allow removal of HEAD
41
42
+ "git symbolic-ref -d HEAD" happily removes the symbolic ref, but
43
+ the resulting repository becomes an invalid one. Teach the command
44
+ to forbid removal of HEAD.
45
80
-* jk/squelch-false-warning-from-gcc-o3 (2016-08-31) 2 commits
81
- - color_parse_mem: initialize "struct color" temporary
82
- - error_errno: use constant return similar to error()
83
-
84
---------------------------------------------------
85
-[Graduated to "master"]
86
-
87
-* bw/mingw-avoid-inheriting-fd-to-lockfile (2016-08-23) 2 commits
88
- (merged to 'next' on 2016-08-24 at 8389b0e)
89
- + mingw: ensure temporary file handles are not inherited by child processes
90
- + t6026-merge-attr: child processes must not inherit index.lock handles
91
-
92
- The tempfile (hence its user lockfile) API lets the caller to open
93
- a file descriptor to a temporary file, write into it and then
94
- finalize it by first closing the filehandle and then either
95
- removing or renaming the temporary file. When the process spawns a
96
- subprocess after obtaining the file descriptor, and if the
97
- subprocess has not exited when the attempt to remove or rename is
98
- made, the last step fails on Windows, because the subprocess has
99
- the file descriptor still open. Open tempfile with O_CLOEXEC flag
100
- to avoid this (on Windows, this is mapped to O_NOINHERIT).
101
-
102
-
103
-* dg/document-git-c-in-git-config-doc (2016-08-23) 1 commit
104
- (merged to 'next' on 2016-08-24 at a923eb0)
105
- + doc: mention `git -c` in git-config(1)
106
-
107
- The "git -c var[=val] cmd" facility to append a configuration
108
- variable definition at the end of the search order was described in
109
- git(1) manual page, but not in git-config(1), which was more likely
110
- place for people to look for when they ask "can I make a one-shot
111
- override, and if so how?"
112
-
113
-
114
-* ja/i18n (2016-08-24) 3 commits
115
- (merged to 'next' on 2016-08-24 at 3a084aa)
116
- + i18n: simplify numeric error reporting
117
- + i18n: fix git rebase interactive commit messages
118
- + i18n: fix typos for translation
119
-
120
- The recent i18n patch we added during this cycle did a bit too much
121
- refactoring of the messages to avoid word-legos; the repetition has
122
- been reduced to help translators.
123
-
124
-
125
-* js/no-html-bypass-on-windows (2016-08-19) 1 commit
126
- (merged to 'next' on 2016-08-24 at 05728f8)
127
- + Revert "display HTML in default browser using Windows' shell API"
128
-
129
- On Windows, help.browser configuration variable used to be ignored,
130
- which has been corrected.
131
-
132
-
133
-* kw/patch-ids-optim (2016-08-29) 1 commit
134
- (merged to 'next' on 2016-08-30 at 9590e42)
135
- + p3400: make test script executable
136
-
137
- Micro hot-fix for a topic that is already in.
138
-
139
-
140
-* ls/packet-line-protocol-doc-fix (2016-08-30) 1 commit
141
- - pack-protocol: fix maximum pkt-line size
142
-
143
- Correct an age-old calco (is that a typo-like word for calc)
144
- in the documentation.
145
-
146
-
147
-* mh/blame-worktree (2016-08-29) 1 commit
148
- (merged to 'next' on 2016-08-30 at 6c8d903)
149
- + blame: fix segfault on untracked files
150
-
151
- Micro hot-fix for a topic that is already in.
46
+ Will merge to 'next'.
47
48
--------------------------------------------------
49
[Stalled]
@@ -403,12 +298,80 @@ of the repositories listed at
298
--------------------------------------------------
299
[Cooking]
300
301
+* bh/diff-highlight-graph (2016-08-31) 6 commits
302
+ (merged to 'next' on 2016-08-31 at 523a15f)
303
+ + diff-highlight: avoid highlighting combined diffs
304
+ + diff-highlight: add multi-byte tests
305
+ + diff-highlight: ignore test cruft
306
+ + diff-highlight: add support for --graph output
307
+ + diff-highlight: add failing test for handling --graph output
308
+ + diff-highlight: add some tests
309
+
310
+ "diff-highlight" script (in contrib/) learned to work better with
311
+ "git log -p --graph" output.
312
+
313
+ Will merge to 'master'.
314
+
315
+
316
+* jc/am-read-author-file (2016-08-30) 1 commit
317
+ - am: refactor read_author_script()
318
+
319
+ Extract a small helper out of the function that reads the authors
320
+ script file "git am" internally uses.
321
+
322
+ Will merge to 'next'.
323
+ This by itself is not useful until a second caller appears in the
324
+ future for "rebase -i" helper.
325
+
326
+
327
+* jk/test-lib-drop-pid-from-results (2016-08-30) 1 commit
328
+ - test-lib: drop PID from test-results/*.count
329
+
330
+ The test framework left the number of tests and success/failure
331
+ count in the t/test-results directory, keyed by the name of the
332
+ test script plus the process ID. The latter however turned out not
333
+ to serve any useful purpose. The process ID part of the filename
334
+ has been removed.
335
+
336
+ Will merge to 'next'.
337
+
338
+
339
+* js/sequencer-wo-die (2016-08-29) 14 commits
340
+ - sequencer: lib'ify save_opts()
341
+ - sequencer: lib'ify save_todo()
342
+ - sequencer: lib'ify save_head()
343
+ - sequencer: lib'ify create_seq_dir()
344
+ - sequencer: lib'ify read_populate_opts()
345
+ - sequencer: lib'ify read_populate_todo()
346
+ - sequencer: lib'ify read_and_refresh_cache()
347
+ - sequencer: lib'ify prepare_revs()
348
+ - sequencer: lib'ify walk_revs_populate_todo()
349
+ - sequencer: lib'ify do_pick_commit()
350
+ - sequencer: lib'ify do_recursive_merge()
351
+ - sequencer: lib'ify write_message()
352
+ - sequencer: do not die() in do_pick_commit()
353
+ - sequencer: lib'ify sequencer_pick_revisions()
354
+
355
+ Lifts calls to exit(2) and die() higher in the callchain in
356
+ sequencer.c files so that more helper functions in it can be used
357
+ by callers that want to handle error conditions themselves.
358
+
359
+ Waiting for a reroll.
360
+
361
+
362
+* jk/squelch-false-warning-from-gcc-o3 (2016-08-31) 2 commits
363
+ - color_parse_mem: initialize "struct color" temporary
364
+ - error_errno: use constant return similar to error()
365
+
366
+ Will merge to 'next'.
367
+
368
+
369
* hv/doc-commit-reference-style (2016-08-26) 1 commit
370
(merged to 'next' on 2016-08-31 at 68fb778)
371
+ SubmittingPatches: use gitk's "Copy commit summary" format
372
373
A small doc update.
411
- Will keep in 'next' during the rest of the cycle.
374
+ Will merge to 'master'.
375
376
377
* cc/receive-pack-limit (2016-08-24) 3 commits
@@ -421,7 +384,7 @@ of the repositories listed at
384
be rejected by setting a new configuration variable at the receiving
385
end.
386
424
- Will keep in 'next' during the rest of the cycle.
387
+ Will merge to 'master'.
388
389
390
* jk/format-patch-number-singleton-patch-with-cover (2016-08-23) 1 commit
@@ -432,7 +395,7 @@ of the repositories listed at
395
with a separate cover letter now numbers the output as [PATCH 0/1]
396
and [PATCH 1/1] by default.
397
435
- Will keep in 'next' during the rest of the cycle.
398
+ Will merge to 'master'.
399
400
401
* cp/completion-negative-refs (2016-08-24) 1 commit
@@ -459,7 +422,7 @@ of the repositories listed at
422
a repository with a tightly packed packfile, but it did not scale
423
well even with a larger value of core.deltaBaseCacheLimit.
424
462
- Will keep in 'next' during the rest of the cycle.
425
+ Will merge to 'master'.
426
427
428
* js/cat-file-filters (2016-08-24) 4 commits
@@ -513,7 +476,7 @@ of the repositories listed at
476
which was not intuitive, given that "git nosuchcommand" said "git:
477
'nosuchcommand' is not a git command".
478
516
- Will keep in 'next' during the rest of the cycle.
479
+ Will merge to 'master'.
480
481
482
* po/range-doc (2016-08-13) 12 commits
@@ -534,24 +497,25 @@ of the repositories listed at
497
Clarify various ways to specify the "revision ranges" in the
498
documentation.
499
537
- Will keep in 'next' during the rest of the cycle.
500
+ Will merge to 'master'.
501
502
540
-* jk/diff-submodule-diff-inline (2016-08-26) 8 commits
541
- - diff: teach diff to display submodule difference with an inline diff
542
- - submodule: refactor show_submodule_summary with helper function
543
- - submodule: convert show_submodule_summary to use struct object_id *
544
- - allow do_submodule_path to work even if submodule isn't checked out
545
- - diff: prepare for additional submodule formats
546
- - graph: add support for --line-prefix on all graph-aware output
547
- - diff.c: remove output_prefix_length field
548
- - cache: add empty_tree_oid object and helper function
503
+* jk/diff-submodule-diff-inline (2016-08-31) 8 commits
504
+ (merged to 'next' on 2016-09-02 at 734e42c)
505
+ + diff: teach diff to display submodule difference with an inline diff
506
+ + submodule: refactor show_submodule_summary with helper function
507
+ + submodule: convert show_submodule_summary to use struct object_id *
508
+ + allow do_submodule_path to work even if submodule isn't checked out
509
+ + diff: prepare for additional submodule formats
510
+ + graph: add support for --line-prefix on all graph-aware output
511
+ + diff.c: remove output_prefix_length field
512
+ + cache: add empty_tree_oid object and helper function
513
514
The "git diff --submodule={short,log}" mechanism has been enhanced
515
to allow "--submodule=diff" to show the patch between the submodule
516
commits bound to the superproject.
517
554
- Waiting for a reroll.
518
+ Will merge to 'master'.
519
520
521
* jk/reduce-gc-aggressive-depth (2016-08-11) 1 commit
@@ -592,7 +556,7 @@ of the repositories listed at
556
learned to also peek into $path for presense of corresponding
557
repositories of submodules and borrow objects from there when able.
558
595
- Will keep in 'next' during the rest of the cycle.
559
+ Will merge to 'master'.
560
561
562
* jh/status-v2-porcelain (2016-08-12) 9 commits
@@ -612,7 +576,7 @@ of the repositories listed at
576
further be used to teach git-prompt (in contrib/) to make fewer
577
calls to git.
578
615
- Will keep in 'next' during the rest of the cycle.
579
+ Will merge to 'master'.
580
581
582
* mh/diff-indent-heuristic (2016-08-23) 6 commits
@@ -679,7 +643,7 @@ of the repositories listed at
643
"git am" has been taught to make an internal call to "git apply"'s
644
innards without spawning the latter as a separate process.
645
682
- Will hold for a bit more and then merge to 'next'.
646
+ Waiting for a reroll.
647
648
649
* jk/pack-objects-optim-mru (2016-08-11) 4 commits