What's cooking (2017/04 #03)
Junio C Hamano committed
Apr 18, 2017 at 22:42 UTC
593695fe106f842d958a2297cd5cec25989ab955
1 file changed
+291
-259
whats-cooking.txt
+291
-259
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Apr 2017, #02; Sun, 16)
3
+Subject: What's cooking in git.git (Apr 2017, #03; Tue, 18)
4
X-master-at: 584f8975d2d9530a34bd0b936ae774f82fe30fed
5
-X-next-at: 2cccc8116438182c988c7f26d9559a1c22e78f1c
5
+X-next-at: 79292aac69b6a4563ffbc4589a70ae46f7eb15cb
6
7
-What's cooking in git.git (Apr 2017, #02; Sun, 16)
7
+What's cooking in git.git (Apr 2017, #03; Tue, 18)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -18,114 +18,252 @@ of the repositories listed at
18
http://git-blame.blogspot.com/p/git-public-repositories.html
19
20
--------------------------------------------------
21
-[Graduated to "master"]
21
+[New Topics]
22
23
-* ab/regen-perl-mak-with-different-perl (2017-03-29) 1 commit
24
- (merged to 'next' on 2017-04-11 at 706b224f1e)
25
- + perl: regenerate perl.mak if perl -V changes
23
+* df/dir-iter-remove-subtree (2017-04-17) 5 commits
24
+ - remove_subtree(): reimplement using iterators
25
+ - dir_iterator: refactor state machine model
26
+ - dir_iterator: add helpers to dir_iterator_advance
27
+ - remove_subtree(): test removing nested directories
28
+ - dir_iterator: add tests for dir_iterator API
29
27
- Update the build dependency so that an update to /usr/bin/perl
28
- etc. result in recomputation of perl.mak file.
30
+ Update the dir-iterator API and use it to reimplement
31
+ remove_subtree().
32
33
+ Waiting for response to review.
34
+ GSoC microproject.
35
31
-* jc/bs-t-is-not-a-tab-for-sed (2017-03-31) 1 commit
32
- (merged to 'next' on 2017-04-11 at 5573b2c49b)
33
- + contrib/git-resurrect.sh: do not write \t for HT in sed scripts
36
35
- Code cleanup.
37
+* jk/ls-files-recurse-submodules-fix (2017-04-18) 2 commits
38
+ - ls-files: fix path used when recursing into submodules
39
+ - ls-files: fix recurse-submodules with nested submodules
40
41
+ "ls-files --recurse-submodules" did not quite work well in a
42
+ project with nested submodules.
43
38
-* jc/unused-symbols (2017-03-31) 1 commit
39
- (merged to 'next' on 2017-04-11 at 750a6d9e97)
40
- + remote.[ch]: parse_push_cas_option() can be static
44
+ Will merge to 'next'.
45
42
- Code cleanup.
46
47
+* jt/fetch-pack-error-reporting (2017-04-17) 1 commit
48
+ - fetch-pack: show clearer error message upon ERR
49
+
50
+ "git fetch-pack" was not prepared to accept ERR packet that the
51
+ upload-pack can send with a human-readable error message. It
52
+ showed the packet contents with ERR prefix, so there was no data
53
+ loss, but it was redundant to say "ERR" in an error message.
54
45
-* jk/loose-object-info-report-error (2017-04-01) 2 commits
46
- (merged to 'next' on 2017-04-11 at 3a33761d94)
47
- + index-pack: detect local corruption in collision check
48
- + sha1_loose_object_info: return error for corrupted objects
49
-
50
- Update error handling for codepath that deals with corrupt loose
51
- objects.
52
-
53
-
54
-* jk/snprintf-cleanups (2017-03-30) 18 commits
55
- (merged to 'next' on 2017-04-11 at 42ac56e886)
56
- + daemon: use an argv_array to exec children
57
- + gc: replace local buffer with git_path
58
- + transport-helper: replace checked snprintf with xsnprintf
59
- + convert unchecked snprintf into xsnprintf
60
- + combine-diff: replace malloc/snprintf with xstrfmt
61
- + replace unchecked snprintf calls with heap buffers
62
- + receive-pack: print --pack-header directly into argv array
63
- + name-rev: replace static buffer with strbuf
64
- + create_branch: use xstrfmt for reflog message
65
- + create_branch: move msg setup closer to point of use
66
- + avoid using mksnpath for refs
67
- + avoid using fixed PATH_MAX buffers for refs
68
- + fetch: use heap buffer to format reflog
69
- + tag: use strbuf to format tag header
70
- + diff: avoid fixed-size buffer for patch-ids
71
- + odb_mkstemp: use git_path_buf
72
- + odb_mkstemp: write filename into strbuf
73
- + do not check odb_mkstemp return value for errors
74
-
75
- Code clean-up.
76
-
77
-
78
-* js/difftool-builtin (2017-04-13) 2 commits
79
- (merged to 'next' on 2017-04-15 at 0040a91b86)
80
- + difftool: fix use-after-free
81
- (merged to 'next' on 2017-04-11 at 38df92441f)
82
- + difftool: avoid strcpy
55
+ Will merge to 'next'.
56
+
57
+
58
+* nd/conditional-config-in-early-config (2017-04-17) 3 commits
59
+ - config: correct file reading order in read_early_config()
60
+ - config: handle conditional include when $GIT_DIR is not set up
61
+ - config: prepare to pass more info in git_config_with_options()
62
+
63
+ The recently introduced conditional inclusion of configuration did
64
+ not work well when early-config mechanism was involved.
65
+
66
+ Will merge to 'next'.
67
+
68
+
69
+* sb/checkout-recurse-submodules (2017-04-17) 1 commit
70
+ - submodule: remove a superfluous second check for the "new" variable
71
72
Code cleanup.
73
74
+ Will merge to 'next'.
75
87
-* mm/ls-files-s-doc (2017-04-01) 1 commit
88
- (merged to 'next' on 2017-04-11 at 7e55625b1e)
89
- + Documentation: document elements in "ls-files -s" output in order
76
91
- Doc update.
77
+* xy/format-patch-base (2017-04-17) 1 commit
78
+ - doc: trivial typo in git-format-patch.txt
79
80
+ Doc cleanup.
81
+
82
+ Will merge to 'next'.
83
94
-* qp/bisect-docfix (2017-04-01) 1 commit
95
- (merged to 'next' on 2017-04-11 at 9c20eba240)
96
- + git-bisect.txt: add missing word
84
98
- Doc update.
85
+* jk/snprintf-cleanups (2017-04-17) 1 commit
86
+ - replace: plug a memory leak
87
88
+ Hotfix for a topic that is already in 'master'.
89
+
90
+ Will merge to 'next'.
91
+
92
+
93
+* ab/clone-no-tags (2017-04-18) 1 commit
94
+ - clone: add a --no-tags option to clone without tags
95
101
-* sb/show-diff-for-submodule-in-diff-fix (2017-04-02) 1 commit
102
- (merged to 'next' on 2017-04-11 at 8d16ef369e)
103
- + diff: submodule inline diff to initialize env array.
96
+ "git clone" learned the "--no-tags" option not to fetch all tags
97
+ initially, and also set up the tagopt not to follow any tags in
98
+ subsequent fetches.
99
105
- "git diff --submodule=diff" learned to work better in a project
106
- with a submodule that in turn has its own submodules.
100
101
+* ab/completion-push-delete-ref (2017-04-18) 1 commit
102
+ - completion: expand "push --delete <remote> <ref>" for refs on that <remote>
103
109
-* sb/unpack-trees-would-lose-submodule-message-update (2017-03-29) 1 commit
110
- (merged to 'next' on 2017-04-11 at 61d8ce8218)
111
- + unpack-trees.c: align submodule error message to the other error messages
104
+ The completion script (in contrib/) learned to complete "git push
105
+ --delete b<TAB>" to complete branch name to be deleted.
106
113
- Update an error message.
107
+
108
+* bw/forking-and-threading (2017-04-18) 11 commits
109
+ - run-command: block signals between fork and execve
110
+ - run-command: add note about forking and threading
111
+ - run-command: handle dup2 and close errors in child
112
+ - run-command: eliminate calls to error handling functions in child
113
+ - run-command: don't die in child when duping /dev/null
114
+ - run-command: prepare child environment before forking
115
+ - string-list: add string_list_remove function
116
+ - run-command: use the async-signal-safe execv instead of execvp
117
+ - run-command: prepare command before forking
118
+ - t0061: run_command executes scripts without a #! line
119
+ - t5550: use write_script to generate post-update hook
120
+
121
+
122
+* sb/reset-recurse-submodules (2017-04-18) 4 commits
123
+ - builtin/reset: add --recurse-submodules switch
124
+ - submodule.c: submodule_move_head works with broken submodules
125
+ - submodule.c: uninitialized submodules are ignored in recursive commands
126
+ - entry.c: submodule recursing: respect force flag correctly
127
+
128
+ "git reset" learned "--recurse-submodules" option.
129
130
--------------------------------------------------
116
-[New Topics]
131
+[Stalled]
132
+
133
+* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
134
+ - clone: respect configured fetch respecs during initial fetch
135
+
136
+ Expecting a reroll.
137
+ cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
138
+ cf. <CAM0VKj=rsAfKvVccOMOoo5==Q1yW1U0zJBbUV=faKppWFm-u+g@mail.gmail.com>
139
+ Some nits but looks ok.
140
+
141
+
142
+* sk/dash-is-previous (2017-03-01) 5 commits
143
+ - revert.c: delegate handling of "-" shorthand to setup_revisions
144
+ - sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
145
+ - revision.c: args starting with "-" might be a revision
146
+ - revision.c: swap if/else blocks
147
+ - revision.c: do not update argv with unknown option
148
+
149
+ A dash "-" can be written to mean "the branch that was previously
150
+ checked out" in more places.
151
+
152
+ Needs review.
153
+ cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
154
+
155
+
156
+* ls/filter-process-delayed (2017-03-06) 1 commit
157
+ - convert: add "status=delayed" to filter process protocol
158
+
159
+ What's the status of this one???
160
+ cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
161
+
162
+
163
+* nd/worktree-move (2017-01-27) 7 commits
164
+ . fixup! worktree move: new command
165
+ . worktree remove: new command
166
+ . worktree move: refuse to move worktrees with submodules
167
+ . worktree move: accept destination as directory
168
+ . worktree move: new command
169
+ . worktree.c: add update_worktree_location()
170
+ . worktree.c: add validate_worktree()
171
+
172
+ "git worktree" learned move and remove subcommands.
173
+
174
+ Tentatively ejected as it seems to break 'pu' when merged.
175
+
176
+
177
+* pb/bisect (2017-02-18) 28 commits
178
+ - fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
179
+ - bisect--helper: remove the dequote in bisect_start()
180
+ - bisect--helper: retire `--bisect-auto-next` subcommand
181
+ - bisect--helper: retire `--bisect-autostart` subcommand
182
+ - bisect--helper: retire `--bisect-write` subcommand
183
+ - bisect--helper: `bisect_replay` shell function in C
184
+ - bisect--helper: `bisect_log` shell function in C
185
+ - bisect--helper: retire `--write-terms` subcommand
186
+ - bisect--helper: retire `--check-expected-revs` subcommand
187
+ - bisect--helper: `bisect_state` & `bisect_head` shell function in C
188
+ - bisect--helper: `bisect_autostart` shell function in C
189
+ - bisect--helper: retire `--next-all` subcommand
190
+ - bisect--helper: retire `--bisect-clean-state` subcommand
191
+ - bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
192
+ - t6030: no cleanup with bad merge base
193
+ - bisect--helper: `bisect_start` shell function partially in C
194
+ - bisect--helper: `get_terms` & `bisect_terms` shell function in C
195
+ - bisect--helper: `bisect_next_check` & bisect_voc shell function in C
196
+ - bisect--helper: `check_and_set_terms` shell function in C
197
+ - bisect--helper: `bisect_write` shell function in C
198
+ - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
199
+ - bisect--helper: `bisect_reset` shell function in C
200
+ - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
201
+ - t6030: explicitly test for bisection cleanup
202
+ - bisect--helper: `bisect_clean_state` shell function in C
203
+ - bisect--helper: `write_terms` shell function in C
204
+ - bisect: rewrite `check_term_format` shell function in C
205
+ - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
206
+
207
+ Move more parts of "git bisect" to C.
208
+
209
+ Expecting a reroll.
210
+ cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
211
+ cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
212
+ cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
213
+
214
+
215
+* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
216
+ - grep: use '/' delimiter for paths
217
+ - grep: only add delimiter if there isn't one already
218
+
219
+ "git grep", when fed a tree-ish as an input, shows each hit
220
+ prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
221
+ almost always either a commit or a tag that points at a commit, the
222
+ early part of the output "<tree-ish>:<path>" can be used as the
223
+ name of the blob and given to "git show". When <tree-ish> is a
224
+ tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
225
+ "<commit>:<dir>"), however, this results in a string that does not
226
+ name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
227
+ "git grep" has been taught to be a bit more intelligent about these
228
+ cases and omit a colon (in the former case) or use slash (in the
229
+ latter case) to produce "<commit>:<path>" and
230
+ "<commit>:<dir>/<path>" that can be used as the name of a blob.
231
+
232
+ Expecting a reroll? Is this good enough with known limitations?
233
+
234
+
235
+* jc/diff-b-m (2015-02-23) 5 commits
236
+ . WIPWIP
237
+ . WIP: diff-b-m
238
+ - diffcore-rename: allow easier debugging
239
+ - diffcore-rename.c: add locate_rename_src()
240
+ - diffcore-break: allow debugging
241
+
242
+ "git diff -B -M" produced incorrect patch when the postimage of a
243
+ completely rewritten file is similar to the preimage of a removed
244
+ file; such a resulting file must not be expressed as a rename from
245
+ other place.
246
+
247
+ The fix in this patch is broken, unfortunately.
248
+
249
+ Will discard.
250
+
251
+--------------------------------------------------
252
+[Cooking]
253
254
* ah/diff-files-ours-theirs-doc (2017-04-13) 1 commit
119
- - diff-files: document --ours etc.
255
+ (merged to 'next' on 2017-04-18 at a4f80f0c3f)
256
+ + diff-files: document --ours etc.
257
258
The diff options "--ours", "--theirs" exist for quite some time.
259
But so far they were not documented. Now they are.
260
124
- Will merge to 'next'.
261
+ Will merge to 'master'.
262
263
127
-* dt/xgethostname-nul-termination (2017-04-13) 1 commit
264
+* dt/xgethostname-nul-termination (2017-04-18) 2 commits
265
- xgethostname: handle long hostnames
266
+ - use HOST_NAME_MAX to size buffers for gethostname(2)
267
268
gethostname(2) may not NUL terminate the buffer if hostname does
269
not fit; unfortunately there is no easy way to see if our buffer
@@ -167,14 +305,15 @@ of the repositories listed at
305
306
307
* jk/no-looking-at-dotgit-outside-repo (2017-04-16) 2 commits
170
- - test-read-cache: setup git dir
171
- - has_sha1_file: don't bother if we are not in a repository
308
+ (merged to 'next' on 2017-04-18 at 68260787ad)
309
+ + test-read-cache: setup git dir
310
+ + has_sha1_file: don't bother if we are not in a repository
311
312
Clean up fallouts from recent tightening of the set-up sequence,
313
where Git barfs when repository information is accessed without
314
first ensuring that it was started in a repository.
315
177
- Will merge to 'next'.
316
+ Will merge to 'master'.
317
318
319
* ls/travis-doc-asciidoctor (2017-04-16) 3 commits
@@ -222,11 +361,12 @@ of the repositories listed at
361
362
363
* sb/submodule-rm-absorb (2017-04-13) 1 commit
225
- - submodule.c: add missing ' in error messages
364
+ (merged to 'next' on 2017-04-18 at 179081f848)
365
+ + submodule.c: add missing ' in error messages
366
367
Error message fix.
368
229
- Will merge to 'next'.
369
+ Will merge to 'master'.
370
371
372
* sr/http-proxy-configuration-fix (2017-04-13) 2 commits
@@ -248,30 +388,36 @@ of the repositories listed at
388
389
390
* va/i18n-perl-scripts (2017-04-13) 1 commit
251
- - git-add--interactive.perl: add missing dot in a message
391
+ (merged to 'next' on 2017-04-18 at 89f1c77091)
392
+ + git-add--interactive.perl: add missing dot in a message
393
394
Message fix.
395
255
- Will merge to 'next'.
396
+ Will merge to 'master'.
397
398
399
* bw/submodule-is-active (2017-04-13) 1 commit
259
- - submodule--helper: fix typo in is_active error message
400
+ (merged to 'next' on 2017-04-18 at 25b05ec29e)
401
+ + submodule--helper: fix typo in is_active error message
402
403
Error message fix.
404
263
- Will merge to 'next'.
405
+ Will merge to 'master'.
406
407
266
-* gb/rebase-signoff (2017-04-16) 3 commits
408
+* gb/rebase-signoff (2017-04-18) 3 commits
409
- rebase: pass --[no-]signoff option to git am
410
- builtin/am: fold am_signoff() into am_append_signoff()
411
- builtin/am: honor --signoff also when --rebasing
412
413
"git rebase" learns "--signoff" option.
414
415
+ Will merge to 'next'.
416
+
417
274
-* jh/add-index-entry-optim (2017-04-15) 3 commits
418
+* jh/add-index-entry-optim (2017-04-17) 5 commits
419
+ - read-cache: speed up has_dir_name (part 2)
420
+ - read-cache: speed up has_dir_name (part 1)
421
- read-cache: speed up add_index_entry during checkout
422
- p0006-read-tree-checkout: perf test to time read-tree
423
- read-cache: add strcmp_offset function
@@ -284,13 +430,14 @@ of the repositories listed at
430
431
432
* ab/grep-plug-pathspec-leak (2017-04-16) 1 commit
287
- - grep: plug a trivial memory leak
433
+ (merged to 'next' on 2017-04-18 at d8f00b5e44)
434
+ + grep: plug a trivial memory leak
435
436
Call clear_pathspec() to release resources immediately before the
437
cmd_grep() function returns.
438
292
- Will merge to 'next'.
293
- Meh.
439
+ Will merge to 'master'.
440
+
441
442
* ab/grep-threading-cleanup (2017-04-16) 8 commits
443
- grep: given --threads with NO_PTHREADS=YesPlease, warn
@@ -304,10 +451,11 @@ of the repositories listed at
451
452
453
* bw/attr-pathspec (2017-04-16) 1 commit
307
- - pathspec: fix segfault in clear_pathspec
454
+ (merged to 'next' on 2017-04-18 at 2644ca1269)
455
+ + pathspec: fix segfault in clear_pathspec
456
309
- Will merge to 'next'.
310
- Hotfix for a topic already in 'master'.
457
+ Will merge to 'master'.
458
+ Hotfix for a topic already in 'master'.
459
460
461
* bw/submodule-with-bs-path (2017-04-16) 1 commit
@@ -320,10 +468,11 @@ of the repositories listed at
468
469
470
* dt/gc-ignore-old-gc-logs (2017-04-16) 1 commit
323
- - t6500: wait for detached auto gc at the end of the test script
471
+ (merged to 'next' on 2017-04-18 at caadf4ff66)
472
+ + t6500: wait for detached auto gc at the end of the test script
473
325
- Will merge to 'next'.
326
- Hotfix for a topic already in 'master'.
474
+ Will merge to 'master'.
475
+ Hotfix for a topic already in 'master'.
476
477
478
* jk/loose-object-fsck (2017-04-16) 1 commit
@@ -345,14 +494,15 @@ of the repositories listed at
494
495
496
* ld/p4-current-branch-fix (2017-04-16) 3 commits
348
- - git-p4: don't use name-rev to get current branch
349
- - git-p4: add read_pipe_text() internal function
350
- - git-p4: add failing test for name-rev rather than symbolic-ref
497
+ (merged to 'next' on 2017-04-18 at 9e74a2609e)
498
+ + git-p4: don't use name-rev to get current branch
499
+ + git-p4: add read_pipe_text() internal function
500
+ + git-p4: add failing test for name-rev rather than symbolic-ref
501
502
"git p4" used "name-rev HEAD" when it wants to learn what branch is
503
checked out; it should use "symbolic-ref HEAD".
504
355
- Will merge to 'next'.
505
+ Will merge to 'master'.
506
507
508
* ls/travis-coccicheck (2017-04-16) 1 commit
@@ -361,7 +511,7 @@ of the repositories listed at
511
Travis CI learns to run coccicheck.
512
513
364
-* rs/misc-cppcheck-fixes (2017-04-16) 3 commits
514
+* rs/misc-cppcheck-fixes (2017-04-17) 3 commits
515
- server-info: avoid calling fclose(3) twice in update_info_file()
516
- files_for_each_reflog_ent_reverse(): close stream and free strbuf on error
517
- am: close stream on error, but not stdin
@@ -371,10 +521,11 @@ of the repositories listed at
521
522
523
* sf/putty-w-args (2017-04-16) 1 commit
374
- - connect.c: handle errors from split_cmdline
524
+ (merged to 'next' on 2017-04-18 at cbf042088c)
525
+ + connect.c: handle errors from split_cmdline
526
376
- Will merge to 'next'.
377
- Hotfix for a topic already in 'master'.
527
+ Will merge to 'master'.
528
+ Hotfix for a topic already in 'master'.
529
530
531
* km/t1400-modernization (2017-04-16) 1 commit
@@ -386,135 +537,13 @@ of the repositories listed at
537
538
539
* vn/revision-shorthand-for-side-branch-log (2017-04-16) 1 commit
389
- - doc/revisions: remove brackets from rev^-n shorthand
540
+ (merged to 'next' on 2017-04-18 at 9fbe55bfef)
541
+ + doc/revisions: remove brackets from rev^-n shorthand
542
543
Doc cleanup.
544
393
- Will merge to 'next'.
394
-
395
---------------------------------------------------
396
-[Stalled]
397
-
398
-* sg/clone-refspec-from-command-line-config (2017-02-27) 1 commit
399
- - clone: respect configured fetch respecs during initial fetch
400
-
401
- Expecting a reroll.
402
- cf. <20170227211217.73gydlxb2qu2sp3m@sigill.intra.peff.net>
403
- cf. <CAM0VKj=rsAfKvVccOMOoo5==Q1yW1U0zJBbUV=faKppWFm-u+g@mail.gmail.com>
404
- Some nits but looks ok.
405
-
406
-
407
-* sk/dash-is-previous (2017-03-01) 5 commits
408
- - revert.c: delegate handling of "-" shorthand to setup_revisions
409
- - sha1_name.c: teach get_sha1_1 "-" shorthand for "@{-1}"
410
- - revision.c: args starting with "-" might be a revision
411
- - revision.c: swap if/else blocks
412
- - revision.c: do not update argv with unknown option
413
-
414
- A dash "-" can be written to mean "the branch that was previously
415
- checked out" in more places.
416
-
417
- Needs review.
418
- cf. <1488007487-12965-1-git-send-email-kannan.siddharth12@gmail.com>
419
-
420
-
421
-* ls/filter-process-delayed (2017-03-06) 1 commit
422
- - convert: add "status=delayed" to filter process protocol
423
-
424
- What's the status of this one???
425
- cf. <xmqq60jmnmef.fsf@junio-linux.mtv.corp.google.com>
426
-
427
-
428
-* nd/worktree-move (2017-01-27) 7 commits
429
- . fixup! worktree move: new command
430
- . worktree remove: new command
431
- . worktree move: refuse to move worktrees with submodules
432
- . worktree move: accept destination as directory
433
- . worktree move: new command
434
- . worktree.c: add update_worktree_location()
435
- . worktree.c: add validate_worktree()
436
-
437
- "git worktree" learned move and remove subcommands.
438
-
439
- Tentatively ejected as it seems to break 'pu' when merged.
440
-
441
-
442
-* pb/bisect (2017-02-18) 28 commits
443
- - fixup! bisect--helper: `bisect_next_check` & bisect_voc shell function in C
444
- - bisect--helper: remove the dequote in bisect_start()
445
- - bisect--helper: retire `--bisect-auto-next` subcommand
446
- - bisect--helper: retire `--bisect-autostart` subcommand
447
- - bisect--helper: retire `--bisect-write` subcommand
448
- - bisect--helper: `bisect_replay` shell function in C
449
- - bisect--helper: `bisect_log` shell function in C
450
- - bisect--helper: retire `--write-terms` subcommand
451
- - bisect--helper: retire `--check-expected-revs` subcommand
452
- - bisect--helper: `bisect_state` & `bisect_head` shell function in C
453
- - bisect--helper: `bisect_autostart` shell function in C
454
- - bisect--helper: retire `--next-all` subcommand
455
- - bisect--helper: retire `--bisect-clean-state` subcommand
456
- - bisect--helper: `bisect_next` and `bisect_auto_next` shell function in C
457
- - t6030: no cleanup with bad merge base
458
- - bisect--helper: `bisect_start` shell function partially in C
459
- - bisect--helper: `get_terms` & `bisect_terms` shell function in C
460
- - bisect--helper: `bisect_next_check` & bisect_voc shell function in C
461
- - bisect--helper: `check_and_set_terms` shell function in C
462
- - bisect--helper: `bisect_write` shell function in C
463
- - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C
464
- - bisect--helper: `bisect_reset` shell function in C
465
- - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
466
- - t6030: explicitly test for bisection cleanup
467
- - bisect--helper: `bisect_clean_state` shell function in C
468
- - bisect--helper: `write_terms` shell function in C
469
- - bisect: rewrite `check_term_format` shell function in C
470
- - bisect--helper: use OPT_CMDMODE instead of OPT_BOOL
471
-
472
- Move more parts of "git bisect" to C.
473
-
474
- Expecting a reroll.
475
- cf. <CAFZEwPPXPPHi8KiEGS9ggzNHDCGhuqMgH9Z8-Pf9GLshg8+LPA@mail.gmail.com>
476
- cf. <CAFZEwPM9RSTGN54dzaw9gO9iZmsYjJ_d1SjUD4EzSDDbmh-XuA@mail.gmail.com>
477
- cf. <CAFZEwPNUXcNY9Qdz=_B7q2kQuaecPzJtTMGdv8YMUPEz2vnp8A@mail.gmail.com>
478
-
479
-
480
-* sh/grep-tree-obj-tweak-output (2017-01-20) 2 commits
481
- - grep: use '/' delimiter for paths
482
- - grep: only add delimiter if there isn't one already
483
-
484
- "git grep", when fed a tree-ish as an input, shows each hit
485
- prefixed with "<tree-ish>:<path>:<lineno>:". As <tree-ish> is
486
- almost always either a commit or a tag that points at a commit, the
487
- early part of the output "<tree-ish>:<path>" can be used as the
488
- name of the blob and given to "git show". When <tree-ish> is a
489
- tree given in the extended SHA-1 syntax (e.g. "<commit>:", or
490
- "<commit>:<dir>"), however, this results in a string that does not
491
- name a blob (e.g. "<commit>::<path>" or "<commit>:<dir>:<path>").
492
- "git grep" has been taught to be a bit more intelligent about these
493
- cases and omit a colon (in the former case) or use slash (in the
494
- latter case) to produce "<commit>:<path>" and
495
- "<commit>:<dir>/<path>" that can be used as the name of a blob.
496
-
497
- Expecting a reroll? Is this good enough with known limitations?
498
-
499
-
500
-* jc/diff-b-m (2015-02-23) 5 commits
501
- . WIPWIP
502
- . WIP: diff-b-m
503
- - diffcore-rename: allow easier debugging
504
- - diffcore-rename.c: add locate_rename_src()
505
- - diffcore-break: allow debugging
506
-
507
- "git diff -B -M" produced incorrect patch when the postimage of a
508
- completely rewritten file is similar to the preimage of a removed
509
- file; such a resulting file must not be expressed as a rename from
510
- other place.
545
+ Will merge to 'master'.
546
512
- The fix in this patch is broken, unfortunately.
513
-
514
- Will discard.
515
-
516
---------------------------------------------------
517
-[Cooking]
547
548
* dt/http-postbuffer-can-be-large (2017-04-13) 1 commit
549
- http.postbuffer: allow full range of ssize_t values
@@ -526,7 +555,9 @@ of the repositories listed at
555
Will merge to 'next'.
556
557
529
-* jh/memihash-opt (2017-04-12) 3 commits
558
+* jh/memihash-opt (2017-04-18) 4 commits
559
+ (merged to 'next' on 2017-04-18 at 6555be6bab)
560
+ + p0004: make perf test executable
561
(merged to 'next' on 2017-04-15 at 6bfc58e19a)
562
+ t3008: skip lazy-init test on a single-core box
563
+ test-online-cpus: helper to return cpu count
@@ -736,34 +767,35 @@ of the repositories listed at
767
768
769
* nd/files-backend-git-dir (2017-04-14) 28 commits
739
- - refs.h: add a note about sorting order of for_each_ref_*
740
- - t1406: new tests for submodule ref store
741
- - t1405: some basic tests on main ref store
742
- - t/helper: add test-ref-store to test ref-store functions
743
- - refs: delete pack_refs() in favor of refs_pack_refs()
744
- - files-backend: avoid ref api targeting main ref store
745
- - refs: new transaction related ref-store api
746
- - refs: add new ref-store api
747
- - refs: rename get_ref_store() to get_submodule_ref_store() and make it public
748
- - files-backend: replace submodule_allowed check in files_downcast()
749
- - refs: move submodule code out of files-backend.c
750
- - path.c: move some code out of strbuf_git_path_submodule()
751
- - refs.c: make get_main_ref_store() public and use it
752
- - refs.c: kill register_ref_store(), add register_submodule_ref_store()
753
- - refs.c: flatten get_ref_store() a bit
754
- - refs: rename lookup_ref_store() to lookup_submodule_ref_store()
755
- - refs.c: introduce get_main_ref_store()
756
- - files-backend: remove the use of git_path()
757
- - files-backend: add and use files_ref_path()
758
- - files-backend: add and use files_reflog_path()
759
- - files-backend: move "logs/" out of TMP_RENAMED_LOG
760
- - files-backend: convert git_path() to strbuf_git_path()
761
- - files-backend: make sure files_rename_ref() always reach the end
762
- - files-backend: add and use files_packed_refs_path()
763
- - files-backend: delete dead code in files_init_db()
764
- - files-backend.c: delete dead code in files_ref_iterator_begin()
765
- - files-backend: make files_log_ref_write() static
766
- - refs.h: add forward declaration for structs used in this file
770
+ (merged to 'next' on 2017-04-18 at 79292aac69)
771
+ + refs.h: add a note about sorting order of for_each_ref_*
772
+ + t1406: new tests for submodule ref store
773
+ + t1405: some basic tests on main ref store
774
+ + t/helper: add test-ref-store to test ref-store functions
775
+ + refs: delete pack_refs() in favor of refs_pack_refs()
776
+ + files-backend: avoid ref api targeting main ref store
777
+ + refs: new transaction related ref-store api
778
+ + refs: add new ref-store api
779
+ + refs: rename get_ref_store() to get_submodule_ref_store() and make it public
780
+ + files-backend: replace submodule_allowed check in files_downcast()
781
+ + refs: move submodule code out of files-backend.c
782
+ + path.c: move some code out of strbuf_git_path_submodule()
783
+ + refs.c: make get_main_ref_store() public and use it
784
+ + refs.c: kill register_ref_store(), add register_submodule_ref_store()
785
+ + refs.c: flatten get_ref_store() a bit
786
+ + refs: rename lookup_ref_store() to lookup_submodule_ref_store()
787
+ + refs.c: introduce get_main_ref_store()
788
+ + files-backend: remove the use of git_path()
789
+ + files-backend: add and use files_ref_path()
790
+ + files-backend: add and use files_reflog_path()
791
+ + files-backend: move "logs/" out of TMP_RENAMED_LOG
792
+ + files-backend: convert git_path() to strbuf_git_path()
793
+ + files-backend: make sure files_rename_ref() always reach the end
794
+ + files-backend: add and use files_packed_refs_path()
795
+ + files-backend: delete dead code in files_init_db()
796
+ + files-backend.c: delete dead code in files_ref_iterator_begin()
797
+ + files-backend: make files_log_ref_write() static
798
+ + refs.h: add forward declaration for structs used in this file
799
(this branch is used by mh/separate-ref-cache, nd/prune-in-worktree and nd/worktree-kill-parse-ref.)
800
801
The "submodule" specific field in the ref_store structure is
@@ -771,7 +803,7 @@ of the repositories listed at
803
when dealing with ref_store that represents the set of refs visible
804
from the other worktrees.
805
774
- Will merge to 'next'.
806
+ Will merge to 'master'.
807
808
809
* jc/bundle (2016-03-03) 6 commits