What's cooking (2017/02 #02)
Junio C Hamano committed
Feb 6, 2017 at 14:28 UTC
d194027b76170d3d43519d8cc81eabe5c77f9287
1 file changed
+254
-247
whats-cooking.txt
+254
-247
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Feb 2017, #01; Thu, 2)
4
-X-master-at: 8a8f121049fdd881981799755a041b3f81449805
5
-X-next-at: 3e11673fcc32f542ad8901f843cb6952beb23c51
3
+Subject: What's cooking in git.git (Feb 2017, #02; Mon, 6)
4
+X-master-at: 6e3a7b3398559305c7a239a42e447c21a8f39ff8
5
+X-next-at: 6ec89f72d55e6d68bc583df597c35ed94a9731fd
6
7
-What's cooking in git.git (Feb 2017, #01; Thu, 2)
7
+What's cooking in git.git (Feb 2017, #02; Mon, 6)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,11 +12,6 @@ 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
-The tip of 'master' has most of the topics (and all the big ones)
16
-that should be in the upcoming release. I'll tag 2.12-rc0 sometime
17
-tomorrow. On the 'maint' front, Git 2.11.1 has been tagged with
18
-bugfixes that are already in 'master'.
19
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
@@ -25,146 +20,274 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
28
-* bc/use-asciidoctor-opt (2017-01-31) 8 commits
29
- (merged to 'next' on 2017-01-31 at f2a641f6f3)
30
- + Documentation: implement linkgit macro for Asciidoctor
31
- + Makefile: add a knob to enable the use of Asciidoctor
32
- + Documentation: move dblatex arguments into variable
33
- + Documentation: add XSLT to fix DocBook for Texinfo
34
- + Documentation: sort sources for gitman.texi
35
- + Documentation: remove unneeded argument in cat-texi.perl
36
- + Documentation: modernize cat-texi.perl
37
- + Documentation: fix warning in cat-texi.perl
23
+* cw/log-updates-for-all-refs-really (2017-02-01) 4 commits
24
+ (merged to 'next' on 2017-02-02 at 3e11673fcc)
25
+ + doc: add note about ignoring '--no-create-reflog'
26
+ (merged to 'next' on 2017-01-31 at 53f71d2401)
27
+ + update-ref: add test cases for bare repository
28
+ + refs: add option core.logAllRefUpdates = always
29
+ + config: add markup to core.logAllRefUpdates doc
30
39
- Asciidoctor, an alternative reimplementation of AsciiDoc, still
40
- needs some changes to work with documents meant to be formatted
41
- with AsciiDoc. "make USE_ASCIIDOCTOR=YesPlease" to use it out of
42
- the box to document our pages is getting closer to reality.
31
+ The "core.logAllRefUpdates" that used to be boolean has been
32
+ enhanced to take 'always' as well, to record ref updates to refs
33
+ other than the ones that are expected to be updated (i.e. branches,
34
+ remote-tracking branches and notes).
35
36
45
-* cw/doc-sign-off (2017-01-27) 1 commit
46
- (merged to 'next' on 2017-01-31 at 133cc2886d)
47
- + doc: clarify distinction between sign-off and pgp-signing
37
+* js/re-running-failed-tests (2017-01-27) 1 commit
38
+ (merged to 'next' on 2017-01-31 at 30c3a9e0cf)
39
+ + t/Makefile: add a rule to re-run previously-failed tests
40
49
- Doc update.
41
+ "make -C t failed" will now run only the tests that failed in the
42
+ previous run. This is usable only when prove is not use, and gives
43
+ a useless error message when run after "make clean", but otherwise
44
+ is serviceable.
45
46
52
-* ep/commit-static-buf-cleanup (2017-01-31) 2 commits
53
- (merged to 'next' on 2017-01-31 at 02d3c25219)
54
- + builtin/commit.c: switch to strbuf, instead of snprintf()
55
- + builtin/commit.c: remove the PATH_MAX limitation via dynamic allocation
47
+* pl/complete-diff-submodule-diff (2017-01-30) 1 commit
48
+ (merged to 'next' on 2017-01-31 at 7e668d325c)
49
+ + Completion: Add support for --submodule=diff
50
57
- Code clean-up.
51
+ The command line completion (in contrib/) learned that
52
+ "git diff --submodule=" can take "diff" as a recently added option.
53
54
60
-* gv/mingw-p4-mapuser (2017-01-30) 1 commit
61
- (merged to 'next' on 2017-01-31 at 5a9f2c96f6)
62
- + git-p4: fix git-p4.mapUser on Windows
55
+* rs/object-id (2017-01-30) 3 commits
56
+ (merged to 'next' on 2017-01-31 at c442e4780c)
57
+ + checkout: convert post_checkout_hook() to struct object_id
58
+ + use oidcpy() for copying hashes between instances of struct object_id
59
+ + use oid_to_hex_r() for converting struct object_id hashes to hex strings
60
64
- "git p4" did not work well with multiple git-p4.mapUser entries on
65
- Windows.
61
+ "uchar [40]" to "struct object_id" conversion continues.
62
63
68
-* hv/mingw-help-is-executable (2017-01-30) 1 commit
69
- (merged to 'next' on 2017-01-31 at 89aae8d018)
70
- + help: improve is_executable() on Windows
64
+* sb/submodule-recursive-absorb (2017-01-26) 3 commits
65
+ (merged to 'next' on 2017-01-31 at 0a24cfd06b)
66
+ + submodule absorbing: fix worktree/gitdir pointers recursively for non-moves
67
+ + cache.h: expose the dying procedure for reading gitlinks
68
+ + setup: add gentle version of resolve_git_dir
69
72
- "git help" enumerates executable files in $PATH; the implementation
73
- of "is this file executable?" on Windows has been optimized.
70
+ When a submodule "A", which has another submodule "B" nested within
71
+ it, is "absorbed" into the top-level superproject, the inner
72
+ submodule "B" used to be left in a strange state. The logic to
73
+ adjust the .git pointers in these submodules has been corrected.
74
75
76
-* js/mingw-hooks-with-exe-suffix (2017-01-30) 1 commit
77
- (merged to 'next' on 2017-01-31 at 3b7863c578)
78
- + mingw: allow hooks to be .exe files
76
+* sb/submodule-update-initial-runs-custom-script (2017-01-26) 1 commit
77
+ (merged to 'next' on 2017-01-31 at d794f894c6)
78
+ + submodule update: run custom update script for initial populating as well
79
80
- Names of the various hook scripts must be spelled exactly, but on
81
- Windows, an .exe binary must be named with .exe suffix; notice
82
- $GIT_DIR/hooks/<hookname>.exe as a valid <hookname> hook.
80
+ The user can specify a custom update method that is run when
81
+ "submodule update" updates an already checked out submodule. This
82
+ was ignored when checking the submodule out for the first time and
83
+ we instead always just checked out the commit that is bound to the
84
+ path in the superproject's index.
85
86
85
-* js/retire-relink (2017-01-25) 2 commits
86
- (merged to 'next' on 2017-01-31 at c6c6f9b902)
87
- + relink: really remove the command
88
- + relink: retire the command
87
+* sb/unpack-trees-super-prefix (2017-01-25) 4 commits
88
+ (merged to 'next' on 2017-01-31 at dabe6ca2b1)
89
+ + unpack-trees: support super-prefix option
90
+ + t1001: modernize style
91
+ + t1000: modernize style
92
+ + read-tree: use OPT_BOOL instead of OPT_SET_INT
93
90
- Cruft removal.
94
+ "git read-tree" and its underlying unpack_trees() machinery learned
95
+ to report problematic paths prefixed with the --super-prefix option.
96
97
+--------------------------------------------------
98
+[New Topics]
99
93
-* js/status-pre-rebase-i (2017-01-26) 1 commit
94
- (merged to 'next' on 2017-01-31 at 09e51b2e39)
95
- + status: be prepared for not-yet-started interactive rebase
100
+* bw/push-submodule-only (2017-02-01) 2 commits
101
+ (merged to 'next' on 2017-02-06 at 851edafb14)
102
+ + completion: add completion for --recurse-submodules=only
103
+ + doc: add doc for git-push --recurse-submodules=only
104
97
- After starting "git rebase -i", which first opens the user's editor
98
- to edit the series of patches to apply, but before saving the
99
- contents of that file, "git status" failed to show the current
100
- state (i.e. you are in an interactive rebase session, but you have
101
- applied no steps yet) correctly.
105
+ Add missing documentation update to a recent topic.
106
107
+ Will merge to 'master'.
108
104
-* js/unzip-in-usr-bin-workaround (2017-01-27) 1 commit
105
- (merged to 'next' on 2017-01-31 at 515d1d1f90)
106
- + test-lib: on FreeBSD, look for unzip(1) in /usr/local/bin/
109
108
- Test tweak for FreeBSD where /usr/bin/unzip is unsuitable to run
109
- our tests but /usr/local/bin/unzip is usable.
110
+* cw/completion (2017-02-03) 7 commits
111
+ - completion: recognize more long-options
112
+ - completion: teach remote subcommands to complete options
113
+ - completion: teach replace to complete options
114
+ - completion: teach ls-remote to complete options
115
+ - completion: improve bash completion for git-add
116
+ - completion: add subcommand completion for rerere
117
+ - completion: teach submodule subcommands to complete options
118
119
+ More command line completion (in contrib/) for recent additions.
120
112
-* mm/reset-facl-before-umask-test (2017-01-30) 1 commit
113
- (merged to 'next' on 2017-01-31 at 4a2031e49c)
114
- + t0001: don't let a default ACL interfere with the umask test
121
+ Needs review.
122
116
- Test tweaks for those who have default ACL in their git source tree
117
- that interfere with the umask test.
123
124
+* cw/tag-reflog-message (2017-02-06) 1 commit
125
+ - tag: generate useful reflog message
126
120
-* nd/log-graph-configurable-colors (2017-01-31) 4 commits
121
- (merged to 'next' on 2017-01-31 at 36df9e2376)
122
- + color_parse_mem: allow empty color spec
123
- (merged to 'next' on 2017-01-23 at c369982ad8)
124
- + log --graph: customize the graph lines with config log.graphColors
125
- + color.c: trim leading spaces in color_parse_mem()
126
- + color.c: fix color_parse_mem() with value_len == 0
127
+ "git tag", because refs/tags/* doesn't keep reflog by default, did
128
+ not leave useful message when adding a new entry to reflog.
129
128
- Some people feel the default set of colors used by "git log --graph"
129
- rather limiting. A mechanism to customize the set of colors has
130
- been introduced.
130
+ Waiting for review to conclude.
131
+ An uneven error handling is somewhat disturbing.
132
133
133
-* rs/absolute-pathdup (2017-01-27) 2 commits
134
- (merged to 'next' on 2017-01-31 at f751f64876)
135
- + use absolute_pathdup()
136
- + abspath: add absolute_pathdup()
134
+* dl/document-that-difftool-takes-no-gui-option (2017-02-06) 1 commit
135
+ - Document the --no-gui option in difftool
136
138
- Code cleanup.
137
+ A minor doc update.
138
139
+ Waiting for review to conclude.
140
+ A minor inconsistency is somewhat disturbing.
141
141
-* rs/receive-pack-cleanup (2017-01-30) 1 commit
142
- (merged to 'next' on 2017-01-31 at d660881f69)
143
- + receive-pack: call string_list_clear() unconditionally
142
145
- Code clean-up.
143
+* ew/complete-svn-authorship-options (2017-02-06) 1 commit
144
+ (merged to 'next' on 2017-02-06 at dca324db7c)
145
+ + completion: fix git svn authorship switches
146
+
147
+ Correct command line completion (in contrib/) on "git svn"
148
+
149
+ Will merge to 'master'.
150
+
151
+
152
+* jk/reset-to-break-a-commit-doc (2017-02-03) 1 commit
153
+ (merged to 'next' on 2017-02-06 at 7f571e62e9)
154
+ + reset: add an example of how to split a commit into two
155
+
156
+ A minor doc update.
157
+
158
+ Will merge to 'master'.
159
+
160
+
161
+* js/difftool-builtin (2017-02-06) 1 commit
162
+ (merged to 'next' on 2017-02-06 at 6a90549f38)
163
+ + difftool: fix bug when printing usage
164
+
165
+ A hot-fix to C-rewrite of "git difftool".
166
+
167
+ Will merge to 'master'.
168
+
169
+
170
+* ps/worktree-prune-help-fix (2017-02-06) 1 commit
171
+ (merged to 'next' on 2017-02-06 at eeb96f1677)
172
+ + worktree: fix option descriptions for `prune`
173
174
+ Incorrect usage help message for "git worktree prune" has been fixed.
175
+
176
+ Will merge to 'master'.
177
+
178
+
179
+* rs/p5302-create-repositories-before-tests (2017-02-06) 1 commit
180
+ (merged to 'next' on 2017-02-06 at f93bd2ed47)
181
+ + p5302: create repositories for index-pack results explicitly
182
+
183
+ Adjust a perf test to new world order where commands that do
184
+ require a repository are really strict about having a repository.
185
+
186
+ Will merge to 'master'.
187
+
188
+
189
+* sg/completion (2017-02-03) 21 commits
190
+ - completion: cache the path to the repository
191
+ - completion: extract repository discovery from __gitdir()
192
+ - completion: don't guard git executions with __gitdir()
193
+ - completion: consolidate silencing errors from git commands
194
+ - completion: don't use __gitdir() for git commands
195
+ - completion: respect 'git -C <path>'
196
+ - rev-parse: add '--absolute-git-dir' option
197
+ - completion: fix completion after 'git -C <path>'
198
+ - completion: don't offer commands when 'git --opt' needs an argument
199
+ - completion: list short refs from a remote given as a URL
200
+ - completion: don't list 'HEAD' when trying refs completion outside of a repo
201
+ - completion: list refs from remote when remote's name matches a directory
202
+ - completion: respect 'git --git-dir=<path>' when listing remote refs
203
+ - completion: fix most spots not respecting 'git --git-dir=<path>'
204
+ - completion: ensure that the repository path given on the command line exists
205
+ - completion tests: add tests for the __git_refs() helper function
206
+ - completion tests: check __gitdir()'s output in the error cases
207
+ - completion tests: consolidate getting path of current working directory
208
+ - completion tests: make the $cur variable local to the test helper functions
209
+ - completion tests: don't add test cruft to the test repository
210
+ - completion: improve __git_refs()'s in-code documentation
211
+ (this branch is used by sg/completion-refs-speedup.)
212
+
213
+ Clean-up and updates to command line completion (in contrib/).
214
+
215
+ Will merge to 'next'.
216
148
-* sb/submodule-add-force (2016-11-29) 1 commit
149
- + submodule add: extend force flag to add existing repos
150
- (this branch is used by sb/push-make-submodule-check-the-default.)
217
152
- Originally merged to 'next' on 2016-12-12
218
+* sg/completion-refs-speedup (2017-02-06) 13 commits
219
+ - squash! completion: fill COMPREPLY directly when completing refs
220
+ - completion: fill COMPREPLY directly when completing refs
221
+ - completion: list only matching symbolic and pseudorefs when completing refs
222
+ - completion: let 'for-each-ref' sort remote branches for 'checkout' DWIMery
223
+ - completion: let 'for-each-ref' filter remote branches for 'checkout' DWIMery
224
+ - completion: let 'for-each-ref' strip the remote name from remote branches
225
+ - completion: let 'for-each-ref' and 'ls-remote' filter matching refs
226
+ - completion: don't disambiguate short refs
227
+ - completion: don't disambiguate tags and branches
228
+ - completion: support excluding full refs
229
+ - completion: support completing full refs after '--option=refs/<TAB>'
230
+ - completion: wrap __git_refs() for better option parsing
231
+ - completion: remove redundant __gitcomp_nl() options from _git_commit()
232
+ (this branch uses sg/completion.)
233
154
- "git submodule add" used to be confused and refused to add a
155
- locally created repository; users can now use "--force" option
156
- to add them.
234
+ Will hold.
235
+ This seems to break 9902 when merged to 'pu'.
236
237
159
-* sg/mailmap-self (2017-01-31) 1 commit
160
- (merged to 'next' on 2017-01-31 at 2e7641759c)
161
- + .mailmap: update Gábor Szeder's email address
238
+* sk/parse-remote-cleanup (2017-02-06) 1 commit
239
+ (merged to 'next' on 2017-02-06 at 6ec89f72d5)
240
+ + parse-remote: remove reference to unused op_prep
241
+
242
+ Code clean-up.
243
244
Will merge to 'master'.
245
246
--------------------------------------------------
247
[Stalled]
248
249
+* pb/bisect (2016-10-18) 27 commits
250
+ - bisect--helper: remove the dequote in bisect_start()
251
+ - bisect--helper: retire `--bisect-auto-next` subcommand
252
+ - bisect--helper: retire `--bisect-autostart` subcommand
253
+ - bisect--helper: retire `--bisect-write` subcommand
254
+ - bisect--helper: `bisect_replay` shell function in C
255
+ - bisect--helper: `bisect_log` shell function in C
256
+ - bisect--helper: retire `--write-terms` subcommand
257
+ - bisect--helper: retire `--check-expected-revs` subcommand
258
+ - bisect--helper: `bisect_state` & `bisect_head` shell function in C
259
+ - bisect--helper: `bisect_autostart` shell function in C
260
+ - bisect--helper: retire `--next-all` subcommand
261
+ - bisect--helper: retire `--bisect-clean-state` subcommand
262
+ - bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
263
+ - t6030: no cleanup with bad merge base
264
+ - bisect--helper: `bisect_start` shell function partially in C
265
+ - bisect--helper: `get_terms` & `bisect_terms` shell function in C
266
+ - bisect--helper: `bisect_next_check` & bisect_voc shell function in C
267
+ - bisect--helper: `check_and_set_terms` shell function in C
268
+ - bisect--helper: `bisect_write` shell function in C
269
+ - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
270
+ - bisect--helper: `bisect_reset` shell function in C
271
+ - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
272
+ - t6030: explicitly test for bisection cleanup
273
+ - bisect--helper: `bisect_clean_state` shell function in C
274
+ - bisect--helper: `write_terms` shell function in C
275
+ - bisect: rewrite `check_term_format` shell function in C
276
+ - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
277
+
278
+ Move more parts of "git bisect" to C.
279
+
280
+ Expecting a reroll.
281
+ cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
282
+ cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
283
+
284
+
285
+* ls/filter-process-delayed (2017-01-08) 1 commit
286
+ . convert: add "status=delayed" to filter process protocol
287
+
288
+ Ejected, as does not build when merged to 'pu'.
289
+
290
+
291
* ls/p4-path-encoding (2016-12-18) 1 commit
292
- git-p4: fix git-p4.pathEncoding for removed files
293
@@ -249,56 +372,25 @@ of the repositories listed at
372
[Cooking]
373
374
* jk/delta-chain-limit (2017-01-27) 2 commits
252
- - pack-objects: convert recursion to iteration in break_delta_chain()
253
- - pack-objects: enforce --depth limit in reused deltas
375
+ (merged to 'next' on 2017-02-06 at 9ff36ae9b2)
376
+ + pack-objects: convert recursion to iteration in break_delta_chain()
377
+ + pack-objects: enforce --depth limit in reused deltas
378
379
"git repack --depth=<n>" for a long time busted the specified depth
380
when reusing delta from existing packs. This has been corrected.
381
258
- Will merge to 'next'.
259
-
260
-
261
-* js/re-running-failed-tests (2017-01-27) 1 commit
262
- (merged to 'next' on 2017-01-31 at 30c3a9e0cf)
263
- + t/Makefile: add a rule to re-run previously-failed tests
264
-
265
- "make -C t failed" will now run only the tests that failed in the
266
- previous run. This is usable only when prove is not use, and gives
267
- a useless error message when run after "make clean", but otherwise
268
- is serviceable.
269
-
270
- Will merge to 'master'.
271
-
272
-
273
-* cw/log-updates-for-all-refs-really (2017-02-01) 4 commits
274
- (merged to 'next' on 2017-02-02 at 3e11673fcc)
275
- + doc: add note about ignoring '--no-create-reflog'
276
- (merged to 'next' on 2017-01-31 at 53f71d2401)
277
- + update-ref: add test cases for bare repository
278
- + refs: add option core.logAllRefUpdates = always
279
- + config: add markup to core.logAllRefUpdates doc
280
-
281
- The "core.logAllRefUpdates" that used to be boolean has been
282
- enhanced to take 'always' as well, to record ref updates to refs
283
- other than the ones that are expected to be updated (i.e. branches,
284
- remote-tracking branches and notes).
285
-
286
- Will merge to 'master'.
382
+ Will cook in 'next'.
383
384
385
* mm/merge-rename-delete-message (2017-01-30) 1 commit
386
- merge-recursive: make "CONFLICT (rename/delete)" message show both paths
387
388
+ When "git merge" detects a path that is renamed in one history
389
+ while the other history deleted (or modified) it, it now reports
390
+ both paths to help the user understand what is going on in the two
391
+ histories being merged.
392
293
-* rs/object-id (2017-01-30) 3 commits
294
- (merged to 'next' on 2017-01-31 at c442e4780c)
295
- + checkout: convert post_checkout_hook() to struct object_id
296
- + use oidcpy() for copying hashes between instances of struct object_id
297
- + use oid_to_hex_r() for converting struct object_id hashes to hex strings
298
-
299
- "uchar [40]" to "struct object_id" conversion continues.
300
-
301
- Will merge to 'master'.
393
+ Will merge to and then cook in 'next'.
394
395
396
* rs/swap (2017-01-30) 5 commits
@@ -311,16 +403,8 @@ of the repositories listed at
403
Code clean-up.
404
405
Will merge to 'next'.
314
-
315
-
316
-* pl/complete-diff-submodule-diff (2017-01-30) 1 commit
317
- (merged to 'next' on 2017-01-31 at 7e668d325c)
318
- + Completion: Add support for --submodule=diff
319
-
320
- The command line completion (in contrib/) learned that
321
- "git diff --submodule=" can take "diff" as a recently added option.
322
-
323
- Will merge to 'master'.
406
+ ... unless there is an objection with better alternative. The
407
+ discussion seems to have quieted down.
408
409
410
* ps/urlmatch-wildcard (2017-02-01) 5 commits
@@ -336,31 +420,7 @@ of the repositories listed at
420
proxy used for https://a.example.com, https://b.example.com, etc.,
421
i.e. any host in the example.com domain.
422
339
-
340
-* sb/submodule-recursive-absorb (2017-01-26) 3 commits
341
- (merged to 'next' on 2017-01-31 at 0a24cfd06b)
342
- + submodule absorbing: fix worktree/gitdir pointers recursively for non-moves
343
- + cache.h: expose the dying procedure for reading gitlinks
344
- + setup: add gentle version of resolve_git_dir
345
-
346
- When a submodule "sub", which has another submodule "module" nested
347
- within it, is "absorbed" into the top-level superproject, the inner
348
- submodule "module" is left in a strange state.
349
-
350
- Will merge to 'master'.
351
-
352
-
353
-* sb/submodule-update-initial-runs-custom-script (2017-01-26) 1 commit
354
- (merged to 'next' on 2017-01-31 at d794f894c6)
355
- + submodule update: run custom update script for initial populating as well
356
-
357
- The user can specify a custom update method that is run when
358
- "submodule update" updates an already checked out submodule. This
359
- was ignored when checking the submodule out for the first time and
360
- we instead always just checked out the commit that is bound to the
361
- path in the superproject's index.
362
-
363
- Will merge to 'master'.
423
+ Will merge to and then cook in 'next'.
424
425
426
* sf/putty-w-args (2017-02-01) 5 commits
@@ -379,8 +439,8 @@ of the repositories listed at
439
variable, and give an escape hatch for users to deal with
440
misdetected cases.
441
382
- Expecting a reroll of the last step to plug new memory leak.
383
- cf. <xmqqpoj8z7su.fsf@gitster.mtv.corp.google.com>
442
+ Stalled?
443
+ cf. <alpine.DEB.2.20.1702012319460.3496@virtualbox>
444
445
446
* jk/describe-omit-some-refs (2017-01-23) 5 commits
@@ -399,19 +459,6 @@ of the repositories listed at
459
Will cook in 'next'.
460
461
402
-* sb/unpack-trees-super-prefix (2017-01-25) 4 commits
403
- (merged to 'next' on 2017-01-31 at dabe6ca2b1)
404
- + unpack-trees: support super-prefix option
405
- + t1001: modernize style
406
- + t1000: modernize style
407
- + read-tree: use OPT_BOOL instead of OPT_SET_INT
408
-
409
- "git read-tree" and its underlying unpack_trees() machinery learned
410
- to report problematic paths prefixed with the --super-prefix option.
411
-
412
- Will merge to 'master'.
413
-
414
-
462
* sb/submodule-doc (2017-01-12) 3 commits
463
- submodules: add a background story
464
- submodule update documentation: don't repeat ourselves
@@ -452,7 +499,7 @@ of the repositories listed at
499
The gitattributes machinery is being taught to work better in a
500
multi-threaded environment.
501
455
- Expecting a reroll.
502
+ Will merge to and then cook in 'next'.
503
504
505
* vn/xdiff-func-context (2017-01-15) 1 commit
@@ -467,12 +514,6 @@ of the repositories listed at
514
being discussed.
515
516
470
-* ls/filter-process-delayed (2017-01-08) 1 commit
471
- . convert: add "status=delayed" to filter process protocol
472
-
473
- Ejected, as does not build when merged to 'pu'.
474
-
475
-
517
* nd/worktree-move (2017-01-27) 7 commits
518
- fixup! worktree move: new command
519
- worktree remove: new command
@@ -518,18 +559,6 @@ of the repositories listed at
559
cf. <a1a44640-ff6c-2294-72ac-46322eff8505@ramsayjones.plus.com>
560
561
521
-* sb/push-make-submodule-check-the-default (2017-01-26) 2 commits
522
- (merged to 'next' on 2017-01-26 at 5f4715cea6)
523
- + Revert "push: change submodule default to check when submodules exist"
524
- (merged to 'next' on 2016-12-12 at 1863e05af5)
525
- + push: change submodule default to check when submodules exist
526
-
527
- Turn the default of "push.recurseSubmodules" to "check" when
528
- submodules seem to be in use.
529
-
530
- Retracted.
531
-
532
-
562
* kn/ref-filter-branch-list (2017-01-31) 20 commits
563
(merged to 'next' on 2017-01-31 at e7592a5461)
564
+ branch: implement '--format' option
@@ -573,42 +602,6 @@ of the repositories listed at
602
Will cook in 'next'.
603
604
576
-* pb/bisect (2016-10-18) 27 commits
577
- - bisect--helper: remove the dequote in bisect_start()
578
- - bisect--helper: retire `--bisect-auto-next` subcommand
579
- - bisect--helper: retire `--bisect-autostart` subcommand
580
- - bisect--helper: retire `--bisect-write` subcommand
581
- - bisect--helper: `bisect_replay` shell function in C
582
- - bisect--helper: `bisect_log` shell function in C
583
- - bisect--helper: retire `--write-terms` subcommand
584
- - bisect--helper: retire `--check-expected-revs` subcommand
585
- - bisect--helper: `bisect_state` & `bisect_head` shell function in C
586
- - bisect--helper: `bisect_autostart` shell function in C
587
- - bisect--helper: retire `--next-all` subcommand
588
- - bisect--helper: retire `--bisect-clean-state` subcommand
589
- - bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
590
- - t6030: no cleanup with bad merge base
591
- - bisect--helper: `bisect_start` shell function partially in C
592
- - bisect--helper: `get_terms` & `bisect_terms` shell function in C
593
- - bisect--helper: `bisect_next_check` & bisect_voc shell function in C
594
- - bisect--helper: `check_and_set_terms` shell function in C
595
- - bisect--helper: `bisect_write` shell function in C
596
- - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
597
- - bisect--helper: `bisect_reset` shell function in C
598
- - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
599
- - t6030: explicitly test for bisection cleanup
600
- - bisect--helper: `bisect_clean_state` shell function in C
601
- - bisect--helper: `write_terms` shell function in C
602
- - bisect: rewrite `check_term_format` shell function in C
603
- - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
604
-
605
- Move more parts of "git bisect" to C.
606
-
607
- Expecting a reroll.
608
- cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
609
- cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
610
-
611
-
605
* jc/merge-drop-old-syntax (2015-04-29) 1 commit
606
(merged to 'next' on 2016-12-05 at 041946dae0)
607
+ merge: drop 'git merge <message> HEAD <commit>' syntax
@@ -621,8 +614,6 @@ of the repositories listed at
614
615
Will cook in 'next'.
616
624
---------------------------------------------------
625
-[Discarded]
617
618
* jc/bundle (2016-03-03) 6 commits
619
. index-pack: --clone-bundle option
@@ -644,6 +635,8 @@ of the repositories listed at
635
would need a lot more than just "these are the heads and the pack
636
data is over there", so this may not be sufficient.
637
638
+--------------------------------------------------
639
+[Discarded]
640
641
* jk/nofollow-attr-ignore (2016-11-02) 5 commits
642
. exclude: do not respect symlinks for in-tree .gitignore
@@ -660,3 +653,17 @@ of the repositories listed at
653
one of these files that is a symbolic link.
654
655
Perhaps we want to cover .gitmodules too with the same mechanism?
656
+
657
+
658
+* sb/push-make-submodule-check-the-default (2017-01-26) 2 commits
659
+ (merged to 'next' on 2017-01-26 at 5f4715cea6)
660
+ + Revert "push: change submodule default to check when submodules exist"
661
+ (merged to 'next' on 2016-12-12 at 1863e05af5)
662
+ + push: change submodule default to check when submodules exist
663
+
664
+ Turn the default of "push.recurseSubmodules" to "check" when
665
+ submodules seem to be in use.
666
+
667
+ Retracted.
668
+
669
+