What's cooking (2018/10 #05)
Junio C Hamano committed
Oct 26, 2018 at 16:55 UTC
b7d29f3615f01e3e8e9a5f0430574db329ff2c2d
1 file changed
+719
-533
whats-cooking.txt
+719
-533
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2018, #04; Fri, 19)
4
-X-master-at: c4df23f7927d8d00e666a3c8d1b3375f1dc8a3c1
5
-X-next-at: 500967bb5e73b67708a64a4360867cf2407ba880
3
+Subject: What's cooking in git.git (Oct 2018, #05; Fri, 26)
4
+X-master-at: c670b1f876521c9f7cd40184bf7ed05aad843433
5
+X-next-at: b2b9d981bf34f0657045fe90a098deb6e3a9dbe8
6
7
-What's cooking in git.git (Oct 2018, #04; Fri, 19)
7
+What's cooking in git.git (Oct 2018, #05; Fri, 26)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,15 +12,9 @@ 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
-Two large set of topics on "rebase in C" and "rebase -i in C" are
16
-now in 'next'. A handful of improvements around "git help", "git
17
-grep", and "git status" are in 'master', as well as other internal
18
-changes.
19
-
20
-Note that "cf. <msg-id>" are not meant as "clear all of these and
21
-you are home free". They are primarily to prevent me from merging
22
-topics that are not ready to 'next' by mistake and remind me where
23
-to go back to read the last state of the discussion in the archive.
15
+Quite a few topics have graduated to 'master'. At sixth batch,
16
+'master' now has 450+ patches since v2.19 and 'next' has additional
17
+170+ patches pending.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -30,301 +24,687 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
33
-* bp/read-cache-parallel (2018-10-11) 7 commits
34
- (merged to 'next' on 2018-10-12 at ed6edde799)
35
- + read-cache: load cache entries on worker threads
36
- + ieot: add Index Entry Offset Table (IEOT) extension
37
- + read-cache: load cache extensions on a worker thread
38
- + config: add new index.threads config setting
39
- + eoie: add End of Index Entry (EOIE) extension
40
- + read-cache: clean up casting and byte decoding
41
- + read-cache.c: optimize reading index format v4
27
+* ab/gc-doc-update (2018-10-11) 1 commit
28
+ (merged to 'next' on 2018-10-19 at 84347d36a7)
29
+ + gc doc: mention the commit-graph in the intro
30
+
31
+ The documentation of "git gc" has been updated to mention that it
32
+ is no longer limited to "pruning away crufts" but also updates
33
+ ancillary files like commit-graph as a part of repository
34
+ optimization.
35
+
36
+
37
+* bc/editorconfig (2018-10-09) 2 commits
38
+ (merged to 'next' on 2018-10-16 at 81461ae0fd)
39
+ + editorconfig: indicate settings should be kept in sync
40
+ + editorconfig: provide editor settings for Git developers
41
+
42
+ To help developers, an EditorConfig file that attempts to follow
43
+ the project convention has been added.
44
+
45
+
46
+* ds/coverage-diff (2018-10-10) 1 commit
47
+ (merged to 'next' on 2018-10-16 at c12b7279d9)
48
+ + contrib: add coverage-diff script
49
+
50
+ The result of coverage test can be combined with "git blame" to
51
+ check the test coverage of code introduced recently with a new
52
+ 'coverage-diff' tool (in contrib/).
53
+
54
+
55
+* du/cherry-is-plumbing (2018-10-12) 1 commit
56
+ (merged to 'next' on 2018-10-19 at ffe6c5449e)
57
+ + doc: move git-cherry to plumbing
58
+
59
+ Doc update to mark "git cherry" as a plumbing command.
60
+
61
+
62
+* du/get-tar-commit-id-is-plumbing (2018-10-12) 1 commit
63
+ (merged to 'next' on 2018-10-16 at 23e7f018cd)
64
+ + doc: move git-get-tar-commit-id to plumbing
65
+
66
+ Doc update to mark "git get-tar-commit-id" as a plumbing command.
67
+
68
+
69
+* du/rev-parse-is-plumbing (2018-10-11) 1 commit
70
+ (merged to 'next' on 2018-10-16 at 50aca759e2)
71
+ + doc: move git-rev-parse from porcelain to plumbing
72
+
73
+ Doc update.
74
+
75
+
76
+* js/fuzzer (2018-10-15) 2 commits
77
+ (merged to 'next' on 2018-10-19 at 649a2bf1fb)
78
+ + fuzz: add fuzz testing for packfile indices.
79
+ + fuzz: add basic fuzz testing target.
80
+
81
+ An experiment to fuzz test a few areas, hopefully we can gain more
82
+ coverage to various areas.
83
+
84
+
85
+* js/mingw-default-ident (2018-10-16) 3 commits
86
+ (merged to 'next' on 2018-10-19 at 2f710c811b)
87
+ + mingw: use domain information for default email
88
+ + getpwuid(mingw): provide a better default for the user name
89
+ + getpwuid(mingw): initialize the structure only once
90
+
91
+ The logic to select the default user name and e-mail on Windows has
92
+ been improved.
93
+
94
+
95
+* ld/p4-unshelve (2018-10-16) 3 commits
96
+ (merged to 'next' on 2018-10-19 at 35339798f9)
97
+ + git-p4: fully support unshelving changelists
98
+ + git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved
99
+ + git-p4: do not fail in verbose mode for missing 'fileSize' key
100
+
101
+ "git p4 unshelve" improvements.
102
+
103
+
104
+* ma/t7005-bash-workaround (2018-09-28) 1 commit
105
+ (merged to 'next' on 2018-10-16 at 543e1e6574)
106
+ + t7005-editor: quote filename to fix whitespace-issue
107
+
108
+ Test fix.
109
+
110
+
111
+* mm/doc-no-dashed-git (2018-10-11) 1 commit
112
+ (merged to 'next' on 2018-10-16 at c26bcd740b)
113
+ + doc: fix a typo and clarify a sentence
114
+
115
+ Doc update.
116
+
117
+
118
+* np/log-graph-octopus-fix (2018-10-12) 1 commit
119
+ (merged to 'next' on 2018-10-16 at aa00813683)
120
+ + log: fix coloring of certain octopus merge shapes
121
+
122
+ "git log --graph" showing an octopus merge sometimes miscounted the
123
+ number of display columns it is consuming to show the merge and its
124
+ parent commits, which has been corrected.
125
+
126
+
127
+* rs/subtree-fixes (2018-10-12) 5 commits
128
+ (merged to 'next' on 2018-10-16 at be23c9343c)
129
+ + subtree: performance improvement for finding unexpected parent commits
130
+ (merged to 'next' on 2018-10-12 at 2b47258e04)
131
+ + subtree: improve decision on merges kept in split
132
+ + subtree: use commits before rejoins for splits
133
+ + subtree: make --ignore-joins pay attention to adds
134
+ + subtree: refactor split of a commit into standalone method
135
+
136
+ Various subtree fixes.
137
+ Unless somebody objects, that is.
138
+
139
+
140
+* rv/alias-help (2018-10-11) 3 commits
141
+ (merged to 'next' on 2018-10-19 at f16bbfb3ef)
142
+ + git-help.txt: document "git help cmd" vs "git cmd --help" for aliases
143
+ + git.c: handle_alias: prepend alias info when first argument is -h
144
+ + help: redirect to aliased commands for "git cmd --help"
145
+
146
+ "git cmd --help" when "cmd" is aliased used to only say "cmd is
147
+ aliased to ...". Now it shows that to the standard error stream
148
+ and runs "git $cmd --help" where $cmd is the first word of the
149
+ alias expansion.
150
+
151
+ This could be misleading for those who alias a command with options
152
+ (e.g. with "[alias] cpn = cherry-pick -n", "git cpn --help" would
153
+ show the manual of "cherry-pick", and the reader would not be told
154
+ to pay close attention to the part that describes the "--no-commit"
155
+ option until closing the pager that showed the contents of the
156
+ manual, if the pager is configured to restore the original screen,
157
+ or would not be told at all, if the pager simply makes the message
158
+ on the standard error scroll away.
159
+
160
+
161
+* sb/diff-emit-line-ws-markup-cleanup (2018-10-12) 1 commit
162
+ (merged to 'next' on 2018-10-16 at a68a6f0003)
163
+ + diff.c: pass sign_index to emit_line_ws_markup
164
+
165
+ Code clean-up.
166
+
167
+
168
+* sg/split-index-racefix (2018-10-12) 7 commits
169
+ (merged to 'next' on 2018-10-16 at c1d6563c51)
170
+ + split-index: BUG() when cache entry refers to non-existing shared entry
171
+ + split-index: smudge and add racily clean cache entries to split index
172
+ + split-index: don't compare cached data of entries already marked for split index
173
+ + split-index: count the number of deleted entries
174
+ + t1700-split-index: date back files to avoid racy situations
175
+ + split-index: add tests to demonstrate the racy split index problem
176
+ + t1700-split-index: document why FSMONITOR is disabled in this test script
177
+
178
+ The codepath to support the experimental split-index mode had
179
+ remaining "racily clean" issues fixed.
180
+
181
+--------------------------------------------------
182
+[New Topics]
183
+
184
+* sb/more-repo-in-api (2018-10-19) 19 commits
185
+ - submodule: don't add submodule as odb for push
186
+ - submodule: use submodule repos for object lookup
187
+ - pretty: prepare format_commit_message to handle arbitrary repositories
188
+ - commit: prepare logmsg_reencode to handle arbitrary repositories
189
+ - commit: prepare repo_unuse_commit_buffer to handle arbitrary repositories
190
+ - commit: prepare get_commit_buffer to handle arbitrary repositories
191
+ - commit-reach: prepare in_merge_bases[_many] to handle arbitrary repositories
192
+ - commit-reach: prepare get_merge_bases to handle arbitrary repositories
193
+ - commit-reach.c: allow get_merge_bases_many_0 to handle arbitrary repositories
194
+ - commit-reach.c: allow remove_redundant to handle arbitrary repositories
195
+ - commit-reach.c: allow merge_bases_many to handle arbitrary repositories
196
+ - commit-reach.c: allow paint_down_to_common to handle arbitrary repositories
197
+ - commit: allow parse_commit* to handle arbitrary repositories
198
+ - object: parse_object to honor its repository argument
199
+ - object-store: prepare has_{sha1, object}_file[_with_flags] to handle arbitrary repositories
200
+ - object-store: prepare read_object_file to deal with arbitrary repositories
201
+ - object-store: allow read_object_file_extended to read from arbitrary repositories
202
+ - packfile: allow has_packed_and_bad to handle arbitrary repositories
203
+ - sha1_file: allow read_object to read objects in arbitrary repositories
204
+
205
+ The in-core repository instances are passed through more codepaths.
206
+
207
+ Not quite correct?
208
+ cf. <20181025091406.GK30222@szeder.dev>
209
+
210
+
211
+* en/merge-path-collision (2018-10-22) 8 commits
212
+ - merge-recursive: improve rename/rename(1to2)/add[/add] handling
213
+ - merge-recursive: use handle_file_collision for add/add conflicts
214
+ - merge-recursive: improve handling for rename/rename(2to1) conflicts
215
+ - merge-recursive: fix rename/add conflict handling
216
+ - merge-recursive: new function for better colliding conflict resolutions
217
+ - merge-recursive: increase marker length with depth of recursion
218
+ - t6036, t6042: testcases for rename collision of already conflicting files
219
+ - Add testcases for consistency in file collision conflict handling
220
+ (this branch uses en/merge-cleanup-more.)
221
+
222
+
223
+* jt/tighten-fetch-proto-v2-response (2018-10-22) 2 commits
224
+ - SQUASH???
225
+ - fetch-pack: be more precise in parsing v2 response
226
+
227
+ "git fetch" was a bit loose in parsing resposes from the other side
228
+ when talking over the protocol v2.
229
+
230
+ Will squash the fix and merge to 'next'.
231
+
232
+
233
+* nd/complete-format-patch (2018-10-22) 1 commit
234
+ . completion: use __gitcomp_builtin for format-patch
235
+
236
+ Expecting a reroll.
237
+
238
+
239
+* nd/completion-negation (2018-10-22) 1 commit
240
+ - completion: fix __gitcomp_builtin no longer consider extra options
241
+
242
+ The command line completion machinery (in contrib/) has been
243
+ updated to allow the completion script to tweak the list of options
244
+ that are reported by the parse-options machinery correctly.
245
+
246
+ Will merge to 'next'.
247
+
248
+
249
+* nd/config-split (2018-10-22) 59 commits
250
+ - config.txt: move worktree.* to a separate file
251
+ - config.txt: move web.* to a separate file
252
+ - config.txt: move versionsort.* to a separate file
253
+ - config.txt: move user.* to a separate file
254
+ - config.txt: move url.* to a separate file
255
+ - config.txt: move uploadpack.* to a separate file
256
+ - config.txt: move uploadarchive.* to a separate file
257
+ - config.txt: move transfer.* to a separate file
258
+ - config.txt: move tag.* to a separate file
259
+ - config.txt: move status.* to a separate file
260
+ - config.txt: move splitIndex.* to a separate file
261
+ - config.txt: move showBranch.* to a separate file
262
+ - config.txt: move sequencer.* to a separate file
263
+ - config.txt: move rerere.* to a separate file
264
+ - config.txt: move repack.* to a separate file
265
+ - config.txt: move remotes.* to a separate file
266
+ - config.txt: move remote.* to a separate file
267
+ - config.txt: move protocol.* to a separate file
268
+ - config.txt: move pretty.* to a separate file
269
+ - config.txt: move pager.* to a separate file
270
+ - config.txt: move pack.* to a separate file
271
+ - config.txt: move notes.* to a separate file
272
+ - config.txt: move mergetool.* to a separate file
273
+ - config.txt: move man.* to a separate file
274
+ - config.txt: move mailmap.* to a separate file
275
+ - config.txt: move mailinfo.* to a separate file
276
+ - config.txt: move log.* to a separate file
277
+ - config.txt: move interactive.* to a separate file
278
+ - config.txt: move instaweb.* to a separate file
279
+ - config.txt: move init.* to a separate file
280
+ - config.txt: move index.* to a separate file
281
+ - config.txt: move i18n.* to a separate file
282
+ - config.txt: move ssh.* to a separate file
283
+ - config.txt: move help.* to a separate file
284
+ - config.txt: move guitool.* to a separate file
285
+ - config.txt: move gpg.* to a separate file
286
+ - config.txt: move grep.* to a separate file
287
+ - config.txt: move gitweb.* to a separate file
288
+ - config.txt: move gc.* to a separate file
289
+ - config.txt: move fsck.* to a separate file
290
+ - config.txt: move filter.* to a separate file
291
+ - config.txt: move fastimport.* to a separate file
292
+ - config.txt: move difftool.* to a separate file
293
+ - config.txt: move completion.* to a separate file
294
+ - config.txt: move credential.* to a separate file
295
+ - config.txt: move commit.* to a separate file
296
+ - config.txt: move column.* to a separate file
297
+ - config.txt: move color.* to a separate file
298
+ - config.txt: move clean.* to a separate file
299
+ - config.txt: move checkout.* to a separate file
300
+ - config.txt: move browser.* to a separate file
301
+ - config.txt: move branch.* to a separate file
302
+ - config.txt: move blame.* to a separate file
303
+ - config.txt: move apply.* to a separate file
304
+ - config.txt: move am.* to a separate file
305
+ - config.txt: move alias.* to a separate file
306
+ - config.txt: move add.* to a separate file
307
+ - config.txt: move core.* to a separate file
308
+ - config.txt: move advice.* to a separate file
309
+
310
+ Expecting a reroll.
311
+
312
+
313
+* nd/per-worktree-config (2018-10-22) 2 commits
314
+ - worktree: add per-worktree config files
315
+ - t1300: extract and use test_cmp_config()
316
+
317
+ A fourth class of configuration files (in addition to the
318
+ traditional "system wide", "per user in the $HOME directory" and
319
+ "per repository in the $GIT_DIR/config") has been introduced so
320
+ that different worktrees that share the same repository (hence the
321
+ same $GIT_DIR/config file) can use different customization.
322
+
323
+ Will merge to 'next'.
324
+
325
+
326
+* nd/submodule-unused-vars (2018-10-22) 1 commit
327
+ - submodule.c: remove some of the_repository references
328
+
329
+ Code clean-up.
330
+
331
+ Will merge to 'next'.
332
+
333
+
334
+* nd/unpack-trees-with-cache-tree (2018-10-22) 1 commit
335
+ - read-cache: use of memory after it is freed
336
+
337
+ Trivial bugfix.
338
+
339
+ Will merge to 'next'.
340
+
341
+
342
+* ag/rev-parse-all-exclude-fix (2018-10-24) 1 commit
343
+ - rev-parse: clear --exclude list after 'git rev-parse --all'
344
+
345
+
346
+* ah/doc-updates (2018-10-23) 6 commits
347
+ (merged to 'next' on 2018-10-26 at b0bb46a602)
348
+ + doc: fix formatting in git-update-ref
349
+ + doc: fix indentation of listing blocks in gitweb.conf.txt
350
+ + doc: fix descripion for 'git tag --format'
351
+ + doc: fix inappropriate monospace formatting
352
+ + doc: fix ASCII art tab spacing
353
+ + doc: clarify boundaries of 'git worktree list --porcelain'
354
+
355
+ Doc updates.
356
+
357
+ Will merge to 'master'.
358
+
359
+
360
+* bp/reset-quiet (2018-10-24) 3 commits
361
+ - reset: warn when refresh_index() takes more than 2 seconds
362
+ - reset: add new reset.quiet config setting
363
+ - reset: don't compute unstaged changes after reset when --quiet
364
+
365
+ "git reset --quiet" no longer runs "update-index --refresh"
366
+ internally, which shifts the refresh cost away from the command.
367
+
368
+ Will merge to 'next'.
369
+ cf. <3c31d5c3-df46-69e3-c138-30a93d9b3ce4@ramsayjones.plus.com>
370
+ We may want its doc further updated.
371
+
372
+
373
+* cb/compat-mmap-is-private-read-only (2018-10-25) 1 commit
374
+ (merged to 'next' on 2018-10-26 at d3bfab3034)
375
+ + compat: make sure git_mmap is not expected to write
376
+
377
+ Code tightening.
378
+
379
+ Will merge to 'master'.
380
+
381
+
382
+* cb/khash-maybe-unused-function (2018-10-24) 2 commits
383
+ (merged to 'next' on 2018-10-26 at 17fc4e55a0)
384
+ + khash: silence -Wunused-function for delta-islands
385
+ + commit-slabs: move MAYBE_UNUSED out
386
+
387
+ Build fix.
388
+
389
+ Will merge to 'master'.
390
+
391
+
392
+* dl/mergetool-gui-option (2018-10-25) 3 commits
393
+ (merged to 'next' on 2018-10-26 at 2c46355e81)
394
+ + doc: document diff/merge.guitool config keys
395
+ + completion: support `git mergetool --[no-]gui`
396
+ + mergetool: accept -g/--[no-]gui as arguments
397
+
398
+ "git mergetool" learned to take the "--[no-]gui" option, just like
399
+ "git difftool" does.
400
+
401
+ Will merge to 'master'.
402
+
403
+
404
+* ds/reachable (2018-10-23) 1 commit
405
+ (merged to 'next' on 2018-10-26 at 76b5fc9a46)
406
+ + commit-reach: fix cast in compare_commits_by_gen()
407
+
408
+ Trivial bugfix.
409
+
410
+ Will merge to 'master'.
411
+
412
+
413
+* jc/cocci-preincr (2018-10-24) 2 commits
414
+ (merged to 'next' on 2018-10-26 at cbd98b44e2)
415
+ + fsck: s/++i > 1/i++/
416
+ + cocci: simplify "if (++u > 1)" to "if (u++)"
417
+
418
+ Code cleanup.
419
+
420
+ Will merge to 'master'.
421
+
422
+
423
+* jk/run-command-notdot (2018-10-25) 2 commits
424
+ (merged to 'next' on 2018-10-26 at 9d9335b23f)
425
+ + t0061: adjust to test-tool transition
426
+ + run-command: mark path lookup errors with ENOENT
427
+
428
+ The implementation of run_command() API on the UNIX platforms had a
429
+ bug that caused a command not on $PATH to be found in the current
430
+ directory.
431
+
432
+ Will merge to 'master'.
433
+
434
+
435
+* js/ming-ns-filetime (2018-10-24) 3 commits
436
+ - mingw: implement nanosecond-precision file times
437
+ - mingw: replace MSVCRT's fstat() with a Win32-based implementation
438
+ - mingw: factor out code to set stat() data
439
+
440
+ Windows port learned to use nano-second resolution file timestamps.
441
+
442
+ Will merge to 'next'.
443
+
444
+
445
+* js/mingw-getcwd (2018-10-24) 2 commits
446
+ (merged to 'next' on 2018-10-26 at f31abc8d8f)
447
+ + mingw: fix getcwd when the parent directory cannot be queried
448
+ + mingw: ensure `getcwd()` reports the correct case
449
+
450
+ The way the Windows port figures out the current directory has been
451
+ improved.
452
+
453
+ Will merge to 'master'.
454
+
455
+
456
+* js/mingw-load-sys-dll (2018-10-24) 1 commit
457
+ (merged to 'next' on 2018-10-26 at 1f458a7e04)
458
+ + mingw: load system libraries the recommended way
459
+
460
+ The way DLLs are loaded on the Windows port has been improved.
461
+
462
+ Will merge to 'master'.
463
+
464
+
465
+* js/rebase-autostash-fix (2018-10-24) 5 commits
466
+ - rebase --autostash: fix issue with dirty submodules
467
+ - rebase --autostash: demonstrate a problem with dirty submodules
468
+ - rebase (autostash): use an explicit OID to apply the stash
469
+ - rebase (autostash): store the full OID in <state-dir>/autostash
470
+ - rebase (autostash): avoid duplicate call to state_dir_path()
471
+ (this branch uses ag/rebase-i-in-c, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix, js/rebase-i-break and js/rebase-i-shortopt.)
472
+
473
+ "git rebase" that has recently been rewritten in C had a few issues
474
+ in its "--autstash" feature, which have been corrected.
475
+
476
+ Will merge to 'next'.
477
+
478
+
479
+* js/remote-archive-dwimfix (2018-10-26) 1 commit
480
+ (merged to 'next' on 2018-10-26 at f5bf6946bd)
481
+ + archive: initialize archivers earlier
482
+
483
+ The logic to determine the archive type "git archive" uses did not
484
+ correctly kick in for "git archive --remote", which has been
485
+ corrected.
486
+
487
+ Will merge to 'master'.
488
+
489
+
490
+* js/shallow-and-fetch-prune (2018-10-25) 3 commits
491
+ (merged to 'next' on 2018-10-26 at 93b7196560)
492
+ + repack -ad: prune the list of shallow commits
493
+ + shallow: offer to prune only non-existing entries
494
+ + repack: point out a bug handling stale shallow info
495
+
496
+ "git repack" in a shallow clone did not correctly update the
497
+ shallow points in the repository, leading to a repository that
498
+ does not pass fsck.
499
+
500
+ Will merge to 'master'.
501
+
502
+
503
+* jw/send-email-no-auth (2018-10-23) 1 commit
504
+ - send-email: explicitly disable authentication
505
+
506
+ "git send-email" learned to disable SMTP authentication via the
507
+ "--smtp-auth=none" option, even when the smtp username is given
508
+ (which turns the authentication on by default).
509
+
510
+ Will merge to 'next'.
511
+
512
+
513
+* md/exclude-promisor-objects-fix (2018-10-23) 2 commits
514
+ - exclude-promisor-objects: declare when option is allowed
515
+ - Documentation/git-log.txt: do not show --exclude-promisor-objects
516
+
517
+ Operations on promisor objects make sense in the context of only a
518
+ small subset of the commands that internally use the revisions
519
+ machinery, but the "--exclude-promisor-objects" option were taken
520
+ and led to nonsense results by commands like "log", to which it
521
+ didn't make much sense. This has been corrected.
522
+
523
+ Will merge to 'next'.
524
+
525
+
526
+* mg/gpg-fingerprint (2018-10-23) 3 commits
527
+ (merged to 'next' on 2018-10-26 at 1e219cb754)
528
+ + gpg-interface.c: obtain primary key fingerprint as well
529
+ + gpg-interface.c: support getting key fingerprint via %GF format
530
+ + gpg-interface.c: use flags to determine key/signer info presence
531
+ (this branch uses mg/gpg-parse-tighten; is tangled with jc/gpg-cocci-preincr.)
532
+
533
+ New "--pretty=format:" placeholders %GF and %GP that show the GPG
534
+ key fingerprints have been invented.
535
+
536
+ Will merge to 'master'.
537
+
538
+
539
+* ss/rename-tests (2018-10-23) 5 commits
540
+ (merged to 'next' on 2018-10-26 at e4929c2ece)
541
+ + t7501: rename commit test to comply with naming convention
542
+ + t7500: rename commit tests script to comply with naming convention
543
+ + t7502: rename commit test script to comply with naming convention
544
+ + t7509: cleanup description and filename
545
+ + t2000: rename and combine checkout clash tests
546
+
547
+ Reorganize some tests and rename them; "ls t/" now gives a better
548
+ overview of what is tested for these scripts than before.
549
+
550
+ Will merge to 'master'.
551
+
552
+
553
+* tb/filter-alternate-refs (2018-10-25) 2 commits
554
+ (merged to 'next' on 2018-10-26 at 887a7779a3)
555
+ + t5410: use longer path for sample script
556
+ + Documentation/config.txt: fix typo in core.alternateRefsCommand
557
+
558
+ Test fix.
559
+
560
+ Will merge to 'master'.
561
+
562
+
563
+* jc/http-curlver-warnings (2018-10-26) 1 commit
564
+ (merged to 'next' on 2018-10-26 at 870e125cec)
565
+ + http: give curl version warnings consistently
566
+ (this branch uses js/mingw-http-ssl.)
567
+
568
+ Warning message fix.
569
+
570
+ Will merge to 'master'.
571
+
572
+
573
+* jk/uploadpack-packobjectshook-fix (2018-10-26) 1 commit
574
+ (merged to 'next' on 2018-10-26 at 95c93b1199)
575
+ + upload-pack: fix broken if/else chain in config callback
576
+
577
+ Code clean-up that results in a small bugfix.
578
+
579
+ Will merge to 'master'.
580
+
581
+
582
+* sd/stash-wo-user-name (2018-10-26) 1 commit
583
+ - t3903-stash: test without configured user name
584
43
- A new extension to the index file has been introduced, which allows
44
- the file to be read in parallel.
585
+ An early part of a wip.
586
587
47
-* bp/rename-test-env-var (2018-09-28) 6 commits
48
- (merged to 'next' on 2018-10-12 at 201e451d20)
49
- + t0000: do not get self-test disrupted by environment warnings
50
- + preload-index: update GIT_FORCE_PRELOAD_TEST support
51
- + read-cache: update TEST_GIT_INDEX_VERSION support
52
- + fsmonitor: update GIT_TEST_FSMONITOR support
53
- + preload-index: use git_env_bool() not getenv() for customization
54
- + t/README: correct spelling of "uncommon"
588
+* uk/merge-subtree-doc-update (2018-10-25) 1 commit
589
+ (merged to 'next' on 2018-10-26 at 7ab4fc8ab1)
590
+ + howto/using-merge-subtree: mention --allow-unrelated-histories
591
56
- Some environment variables that control the runtime options of Git
57
- used during tests are getting renamed for consistency.
592
+ Belated documentation update to adjust to a new world order that
593
+ happened a yew years ago.
594
595
+ Will merge to 'master'.
596
60
-* ds/commit-graph-leakfix (2018-10-07) 3 commits
61
- (merged to 'next' on 2018-10-12 at 8cc7f2f1e9)
62
- + commit-graph: reduce initial oid allocation
63
- + builtin/commit-graph.c: UNLEAK variables
64
- + commit-graph: clean up leaked memory during write
597
66
- Code clean-up.
598
+* js/rebase-i-shortopt (2018-10-26) 1 commit
599
+ - rebase -i: recognize short commands without arguments
600
+ (this branch uses ag/rebase-i-in-c and js/rebase-i-break; is tangled with ag/sequencer-reduce-rewriting-todo, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
601
602
69
-* jc/how-to-document-api (2018-09-29) 1 commit
70
- (merged to 'next' on 2018-10-12 at 7c9bd82285)
71
- + CodingGuidelines: document the API in *.h files
603
+* sg/test-rebase-editor-fix (2018-10-26) 1 commit
604
+ - t3404-rebase-interactive: test abbreviated commands
605
73
- Doc update.
606
75
-
76
-* jt/avoid-ls-refs (2018-10-07) 4 commits
77
- (merged to 'next' on 2018-10-12 at 5775aabbc1)
78
- + fetch: do not list refs if fetching only hashes
79
- + transport: list refs before fetch if necessary
80
- + transport: do not list refs if possible
81
- + transport: allow skipping of ref listing
82
-
83
- Over some transports, fetching objects with an exact commit object
84
- name can be done without first seeing the ref advertisements. The
85
- code has been optimized to exploit this.
86
-
87
-
88
-* jt/cache-tree-allow-missing-object-in-partial-clone (2018-10-10) 1 commit
89
- (merged to 'next' on 2018-10-12 at 152ad8e336)
90
- + cache-tree: skip some blob checks in partial clone
91
-
92
- In a partial clone that will lazily be hydrated from the
93
- originating repository, we generally want to avoid "does this
94
- object exist (locally)?" on objects that we deliberately omitted
95
- when we created the clone. The cache-tree codepath (which is used
96
- to write a tree object out of the index) however insisted that the
97
- object exists, even for paths that are outside of the partial
98
- checkout area. The code has been updated to avoid such a check.
99
-
100
-
101
-* jt/fetch-tips-in-partial-clone (2018-09-21) 2 commits
102
- (merged to 'next' on 2018-10-12 at 521b3fb44d)
103
- + fetch: in partial clone, check presence of targets
104
- + connected: document connectivity in partial clones
105
-
106
- "git fetch $repo $object" in a partial clone did not correctly
107
- fetch the asked-for object that is referenced by an object in
108
- promisor packfile, which has been fixed.
109
-
110
-
111
-* jt/non-blob-lazy-fetch (2018-10-04) 2 commits
112
- (merged to 'next' on 2018-10-12 at 7466c6bd7d)
113
- + fetch-pack: exclude blobs when lazy-fetching trees
114
- + fetch-pack: avoid object flags if no_dependents
115
-
116
- A partial clone that is configured to lazily fetch missing objects
117
- will on-demand issue a "git fetch" request to the originating
118
- repository to fill not-yet-obtained objects. The request has been
119
- optimized for requesting a tree object (and not the leaf blob
120
- objects contained in it) by telling the originating repository that
121
- no blobs are needed.
607
+* ss/travis-ci-force-vm-mode (2018-10-26) 1 commit
608
+ - travis-ci: no longer use containers
609
610
124
-* nd/complete-fetch-multiple-args (2018-09-21) 1 commit
125
- (merged to 'next' on 2018-10-10 at f78e14123c)
126
- + completion: support "git fetch --multiple"
611
+* tb/char-may-be-unsigned (2018-10-26) 1 commit
612
+ - path.c: char is not (always) signed
613
128
- Teach bash completion that "git fetch --multiple" only takes remote
129
- names as arguments and no refspecs.
130
-
131
-
132
-* nd/help-commands-verbose-by-default (2018-10-03) 1 commit
133
- (merged to 'next' on 2018-10-12 at 32de8f53e0)
134
- + help -a: improve and make --verbose default
135
-
136
- "git help -a" and "git help -av" give different pieces of
137
- information, and generally the "verbose" version is more friendly
138
- to the new users. "git help -a" by default now uses the more
139
- verbose output (with "--no-verbose", you can go back to the
140
- original). Also "git help -av" now lists aliases and external
141
- commands, which it did not used to.
614
+--------------------------------------------------
615
+[Stalled]
616
617
+* lt/date-human (2018-07-09) 1 commit
618
+ - Add 'human' date format
619
144
-* nd/status-refresh-progress (2018-09-17) 1 commit
145
- (merged to 'next' on 2018-10-12 at 9240c05add)
146
- + status: show progress bar if refreshing the index takes too long
147
-
148
- "git status" learns to show progress bar when refreshing the index
149
- takes a long time.
150
-
151
-
152
-* nd/the-index (2018-09-21) 23 commits
153
- (merged to 'next' on 2018-10-10 at 16e2e2e947)
154
- + revision.c: reduce implicit dependency the_repository
155
- + revision.c: remove implicit dependency on the_index
156
- + ws.c: remove implicit dependency on the_index
157
- + tree-diff.c: remove implicit dependency on the_index
158
- + submodule.c: remove implicit dependency on the_index
159
- + line-range.c: remove implicit dependency on the_index
160
- + userdiff.c: remove implicit dependency on the_index
161
- + rerere.c: remove implicit dependency on the_index
162
- + sha1-file.c: remove implicit dependency on the_index
163
- + patch-ids.c: remove implicit dependency on the_index
164
- + merge.c: remove implicit dependency on the_index
165
- + merge-blobs.c: remove implicit dependency on the_index
166
- + ll-merge.c: remove implicit dependency on the_index
167
- + diff-lib.c: remove implicit dependency on the_index
168
- + read-cache.c: remove implicit dependency on the_index
169
- + diff.c: remove implicit dependency on the_index
170
- + grep.c: remove implicit dependency on the_index
171
- + diff.c: remove the_index dependency in textconv() functions
172
- + blame.c: rename "repo" argument to "r"
173
- + combine-diff.c: remove implicit dependency on the_index
174
- + diff.c: reduce implicit dependency on the_index
175
- + read-cache.c: remove 'const' from index_has_changes()
176
- + archive.c: remove implicit dependency the_repository
177
- (this branch is used by sb/more-repo-in-api.)
178
-
179
- Various codepaths in the core-ish part learn to work on an
180
- arbitrary in-core index structure, not necessarily the default
181
- instance "the_index".
182
-
183
-
184
-* pw/diff-color-moved-ws-fix (2018-10-04) 5 commits
185
- (merged to 'next' on 2018-10-12 at 73badc83fe)
186
- + diff --color-moved: fix a memory leak
187
- + diff --color-moved-ws: fix another memory leak
188
- + diff --color-moved-ws: fix a memory leak
189
- + diff --color-moved-ws: fix out of bounds string access
190
- + diff --color-moved-ws: fix double free crash
191
-
192
- Various fixes to "diff --color-moved-ws".
193
-
194
-
195
-* rs/grep-no-recursive (2018-10-03) 1 commit
196
- (merged to 'next' on 2018-10-12 at 1499dc98ba)
197
- + grep: add -r/--[no-]recursive
198
-
199
- Unlike "grep", "git grep" by default recurses to the whole tree.
200
- The command learned "git grep --recursive" option, so that "git
201
- grep --no-recursive" can serve as a synonym to setting the
202
- max-depth to 0.
203
-
204
-
205
-* rs/oidset-on-khash (2018-10-04) 5 commits
206
- (merged to 'next' on 2018-10-12 at 8bb0152b3f)
207
- + oidset: uninline oidset_init()
208
- + oidset: use khash
209
- + khash: factor out kh_release_*
210
- + fetch-pack: load tip_oids eagerly iff needed
211
- + fetch-pack: factor out is_unmatched_ref()
212
-
213
- The oidset API was built on top of the oidmap API which in turn is
214
- on the hashmap API. Replace the implementation to build on top of
215
- the khash API and gain performance.
216
-
217
-
218
-* sm/show-superproject-while-conflicted (2018-09-28) 1 commit
219
- (merged to 'next' on 2018-10-12 at 0334353131)
220
- + rev-parse: --show-superproject-working-tree should work during a merge
221
-
222
- A corner-case bugfix.
223
-
224
-
225
-* ss/wt-status-committable (2018-10-03) 5 commits
226
- (merged to 'next' on 2018-10-10 at ea30d8819d)
227
- + roll wt_status_state into wt_status and populate in the collect phase
228
- + wt-status.c: set the committable flag in the collect phase
229
- + t7501: add test of "commit --dry-run --short"
230
- + wt-status: rename commitable to committable
231
- + wt-status.c: move has_unmerged earlier in the file
232
-
233
- Code clean-up in the internal machinery used by "git status" and
234
- "git commit --dry-run".
235
-
236
-
237
-* tb/filter-alternate-refs (2018-10-09) 4 commits
238
- (merged to 'next' on 2018-10-12 at 21c14722f1)
239
- + transport.c: introduce core.alternateRefsPrefixes
240
- + transport.c: introduce core.alternateRefsCommand
241
- + transport.c: extract 'fill_alternate_refs_command'
242
- + transport: drop refnames from for_each_alternate_ref
243
-
244
- When pushing into a repository that borrows its objects from an
245
- alternate object store, "git receive-pack" that responds to the
246
- push request on the other side lists the tips of refs in the
247
- alternate to reduce the amount of objects transferred. This
248
- sometimes is detrimental when the number of refs in the alternate
249
- is absurdly large, in which case the bandwidth saved in potentially
250
- fewer objects transferred is wasted in excessively large ref
251
- advertisement. The alternate refs that are advertised are now
252
- configurable with a pair of configuration variables.
620
+ A new date format "--date=human" that morphs its output depending
621
+ on how far the time is from the current time has been introduced.
622
+ "--date=auto" can be used to use this new format when the output is
623
+ goint to the pager or to the terminal and otherwise the default
624
+ format.
625
626
--------------------------------------------------
255
-[New Topics]
627
+[Cooking]
628
629
* ab/reject-alias-loop (2018-10-19) 1 commit
258
- - alias: detect loops in mixed execution mode
630
+ (merged to 'next' on 2018-10-26 at bc213f1bef)
631
+ + alias: detect loops in mixed execution mode
632
633
Two (or more) aliases that mutually refer to each other can form an
634
infinite loop; we now attempt to notice and stop.
635
263
- Will merge to 'next'.
636
+ Will merge to 'master'.
637
638
639
* cb/remove-dead-init (2018-10-19) 2 commits
267
- - multi-pack-index: avoid dead store for struct progress
268
- - unpack-trees: avoid dead store for struct progress
640
+ (merged to 'next' on 2018-10-26 at ba725a64ad)
641
+ + multi-pack-index: avoid dead store for struct progress
642
+ + unpack-trees: avoid dead store for struct progress
643
644
Code clean-up.
645
272
- Will merge to 'next'.
646
+ Will merge to 'master'.
647
648
649
* ds/ci-commit-graph-and-midx (2018-10-19) 1 commit
276
- - ci: add optional test variables
650
+ (merged to 'next' on 2018-10-26 at a13664e49a)
651
+ + ci: add optional test variables
652
653
One of our CI tests to run with "unusual/experimental/random"
279
- settings now also uses commti-graph and midx.
654
+ settings now also uses commit-graph and midx.
655
281
- Will merge to 'next'.
656
+ Will merge to 'master'.
657
658
659
* ds/reachable-first-parent-fix (2018-10-19) 1 commit
285
- - commit-reach: fix first-parent heuristic
660
+ (merged to 'next' on 2018-10-26 at 076442d512)
661
+ + commit-reach: fix first-parent heuristic
662
663
Correct performance regression in commit ancestry computation when
664
generation numbers are involved.
665
290
- Will merge to 'next'.
666
+ Will merge to 'master'.
667
668
669
* jk/test-tool-help (2018-10-18) 1 commit
294
- - test-tool: show tool list on error
670
+ (merged to 'next' on 2018-10-26 at ed32bae21b)
671
+ + test-tool: show tool list on error
672
673
Developer support.
674
298
- Will merge to 'next'.
675
+ Will merge to 'master'.
676
677
678
* jk/unused-function (2018-10-19) 1 commit
302
- - config.mak.dev: enable -Wunused-function
679
+ (merged to 'next' on 2018-10-26 at c8c3fbb432)
680
+ + config.mak.dev: enable -Wunused-function
681
682
Developer support.
683
306
- Will merge to 'next'.
684
+ Will merge to 'master'.
685
686
309
-* js/diff-notice-has-drive-prefix (2018-10-19) 1 commit
310
- - diff: don't attempt to strip prefix from absolute Windows paths
687
+* js/diff-notice-has-drive-prefix (2018-10-22) 1 commit
688
+ (merged to 'next' on 2018-10-26 at 6b2d004194)
689
+ + diff: don't attempt to strip prefix from absolute Windows paths
690
312
- "git diff /a/b/c /a/d/f" noticed these are full paths with shared
313
- leading prefix "/a", but failed to notice a similar fact about "git
314
- diff D:/a/b/c D:/a/d/f", which has been corrected.
691
+ Under certain circumstances, "git diff D:/a/b/c D:/a/b/d" on
692
+ Windows would strip initial parts from the paths because they
693
+ were not recognized as absolute, which has been corrected.
694
316
- Want tests.
695
+ Will merge to 'master'.
696
697
698
* js/pack-objects-mutex-init-fix (2018-10-19) 3 commits
320
- - pack-objects (mingw): initialize `packing_data` mutex in the correct spot
321
- - pack-objects (mingw): demonstrate a segmentation fault with large deltas
322
- - pack-objects: fix typo 'detla' -> 'delta'
699
+ (merged to 'next' on 2018-10-26 at 7516dcc6e4)
700
+ + pack-objects (mingw): initialize `packing_data` mutex in the correct spot
701
+ + pack-objects (mingw): demonstrate a segmentation fault with large deltas
702
+ + pack-objects: fix typo 'detla' -> 'delta'
703
704
A mutex used in "git pack-objects" were not correctly initialized
705
and this caused "git repack" to dump core on Windows.
706
327
- Will merge to 'next'.
707
+ Will merge to 'master'.
708
709
710
* jt/upload-pack-v2-fix-shallow (2018-10-19) 3 commits
@@ -349,19 +729,21 @@ of the repositories listed at
729
730
731
* rj/header-guards (2018-10-18) 1 commit
352
- - headers: normalize the spelling of some header guards
732
+ (merged to 'next' on 2018-10-26 at c767be34df)
733
+ + headers: normalize the spelling of some header guards
734
735
Code clean-up.
736
356
- Will merge to 'next'.
737
+ Will merge to 'master'.
738
739
740
* sb/submodule-helper-remove-cruft (2018-10-18) 1 commit
360
- - builtin/submodule--helper: remove debugging leftover tracing
741
+ (merged to 'next' on 2018-10-26 at 5719bc5d7e)
742
+ + builtin/submodule--helper: remove debugging leftover tracing
743
744
Code clean-up.
745
364
- Will merge to 'next'.
746
+ Will merge to 'master'.
747
748
749
* sb/submodule-url-to-absolute (2018-10-18) 1 commit
@@ -375,85 +757,67 @@ of the repositories listed at
757
758
759
* sg/doc-show-branch-typofix (2018-10-18) 1 commit
378
- - doc: fix small typo in git show-branch
760
+ (merged to 'next' on 2018-10-26 at 9444be6a99)
761
+ + doc: fix small typo in git show-branch
762
763
Docfix.
764
382
- Will merge to 'next'.
765
+ Will merge to 'master'.
766
767
768
* tq/branch-create-wo-branch-get (2018-10-18) 1 commit
386
- - builtin/branch.c: remove useless branch_get
769
+ (merged to 'next' on 2018-10-26 at fe522704b7)
770
+ + builtin/branch.c: remove useless branch_get
771
772
Code clean-up.
773
390
- Will merge to 'next'.
774
+ Will merge to 'master'.
775
776
777
* tq/branch-style-fix (2018-10-18) 1 commit
394
- - branch: trivial style fix
778
+ (merged to 'next' on 2018-10-26 at 6e79291d55)
779
+ + branch: trivial style fix
780
781
Code clean-up.
782
398
- Will merge to 'next'.
783
+ Will merge to 'master'.
784
785
786
* jc/receive-deny-current-branch-fix (2018-10-19) 1 commit
402
- - receive: denyCurrentBranch=updateinstead should not blindly update
787
+ (merged to 'next' on 2018-10-26 at 2975c42215)
788
+ + receive: denyCurrentBranch=updateinstead should not blindly update
789
790
The receive.denyCurrentBranch=updateInstead codepath kicked in even
791
when the push should have been rejected due to other reasons, such
792
as it does not fast-forward or the update-hook rejects it, which
793
has been corrected.
794
409
---------------------------------------------------
410
-[Stalled]
411
-
412
-* lt/date-human (2018-07-09) 1 commit
413
- - Add 'human' date format
414
-
415
- A new date format "--date=human" that morphs its output depending
416
- on how far the time is from the current time has been introduced.
417
- "--date=auto" can be used to use this new format when the output is
418
- goint to the pager or to the terminal and otherwise the default
419
- format.
795
+ Will merge to 'master'.
796
421
---------------------------------------------------
422
-[Cooking]
797
798
* en/merge-cleanup-more (2018-10-18) 2 commits
425
- - merge-recursive: avoid showing conflicts with merge branch before HEAD
426
- - merge-recursive: improve auto-merging messages with path collisions
799
+ (merged to 'next' on 2018-10-26 at c706319c26)
800
+ + merge-recursive: avoid showing conflicts with merge branch before HEAD
801
+ + merge-recursive: improve auto-merging messages with path collisions
802
+ (this branch is used by en/merge-path-collision.)
803
804
Further clean-up of merge-recursive machinery.
805
430
- Will merge to 'next'.
431
-
432
-
433
-* ld/p4-unshelve (2018-10-16) 3 commits
434
- (merged to 'next' on 2018-10-19 at 35339798f9)
435
- + git-p4: fully support unshelving changelists
436
- + git-p4: unshelve into refs/remotes/p4-unshelved, not refs/remotes/p4/unshelved
437
- + git-p4: do not fail in verbose mode for missing 'fileSize' key
438
-
439
- "git p4 unshelve" improvements.
440
-
806
Will merge to 'master'.
807
808
444
-* mg/gpg-parse-tighten (2018-10-15) 1 commit
445
- - gpg-interface.c: detect and reject multiple signatures on commits
809
+* mg/gpg-parse-tighten (2018-10-22) 1 commit
810
+ (merged to 'next' on 2018-10-26 at efdec77193)
811
+ + gpg-interface.c: detect and reject multiple signatures on commits
812
+ (this branch is used by jc/gpg-cocci-preincr and mg/gpg-fingerprint.)
813
814
Detect and reject a signature block that has more than one GPG
815
signature.
816
450
- Expecting another round of polishing, which is promising.
451
- cf. <1539636266.1014.6.camel@gentoo.org>
817
+ Will merge to 'master'.
818
819
454
-* bc/sha-256 (2018-10-16) 14 commits
455
- - SQUASH???
456
- - commit-graph: specify OID version for SHA-256
820
+* bc/sha-256 (2018-10-25) 12 commits
821
- hash: add an SHA-256 implementation using OpenSSL
822
- sha256: add an SHA-256 implementation using libgcrypt
823
- Add a base implementation of SHA-256 support
@@ -471,30 +835,19 @@ of the repositories listed at
835
with the "NewHash".
836
837
474
-* js/mingw-default-ident (2018-10-16) 3 commits
475
- (merged to 'next' on 2018-10-19 at 2f710c811b)
476
- + mingw: use domain information for default email
477
- + getpwuid(mingw): provide a better default for the user name
478
- + getpwuid(mingw): initialize the structure only once
479
-
480
- The logic to select the default user name and e-mail on Windows has
481
- been improved.
482
-
483
- Will merge to 'master'.
484
-
485
-
486
-* js/mingw-http-ssl (2018-10-16) 3 commits
487
- - http: when using Secure Channel, ignore sslCAInfo by default
488
- - http: add support for disabling SSL revocation checks in cURL
489
- - http: add support for selecting SSL backends at runtime
838
+* js/mingw-http-ssl (2018-10-26) 3 commits
839
+ (merged to 'next' on 2018-10-26 at 318e82e101)
840
+ + http: when using Secure Channel, ignore sslCAInfo by default
841
+ + http: add support for disabling SSL revocation checks in cURL
842
+ + http: add support for selecting SSL backends at runtime
843
+ (this branch is used by jc/http-curlver-warnings.)
844
845
On Windows with recent enough cURL library, the configuration
846
variable http.sslBackend can be used to choose between OpenSSL and
847
Secure Channel at runtime as the SSL backend while talking over
848
the HTTPS protocol.
849
496
- Almost there.
497
- cf. <CAPig+cQFb3S0Lm+huUZDN4aw9rWwinh0iZp12ss1zVKpJ=2MdA@mail.gmail.com>
850
+ Will merge to 'master'.
851
852
853
* js/vsts-ci (2018-10-16) 13 commits
@@ -518,54 +871,24 @@ of the repositories listed at
871
cf. <nycvar.QRO.7.76.6.1810151657080.4546@tvgsbejvaqbjf.bet>
872
873
521
-* ab/gc-doc-update (2018-10-11) 1 commit
522
- (merged to 'next' on 2018-10-19 at 84347d36a7)
523
- + gc doc: mention the commit-graph in the intro
524
-
525
- The documentation of "git gc" has been updated to mention that it
526
- is no longer limited to "pruning away crufts" but also updates
527
- ancillary files like commit-graph as a part of repository
528
- optimization.
529
-
530
- Will merge to 'master'.
531
-
532
-
533
-* du/branch-show-current (2018-10-16) 2 commits
534
- - SQUASH???
874
+* du/branch-show-current (2018-10-26) 1 commit
875
- branch: introduce --show-current display option
876
877
"git branch" learned a new subcommand "--show-current".
878
539
- Waiting for ack(s) on SQUASH??? fixup.
540
- cf. <xmqqk1mizb1c.fsf@gitster-ct.c.googlers.com>
541
-
542
-
543
-* du/rev-parse-is-plumbing (2018-10-11) 1 commit
544
- (merged to 'next' on 2018-10-16 at 50aca759e2)
545
- + doc: move git-rev-parse from porcelain to plumbing
546
-
547
- Doc update.
548
-
549
- Will merge to 'master'.
550
-
551
-
552
-* mm/doc-no-dashed-git (2018-10-11) 1 commit
553
- (merged to 'next' on 2018-10-16 at c26bcd740b)
554
- + doc: fix a typo and clarify a sentence
555
-
556
- Doc update.
557
-
558
- Will merge to 'master'.
879
+ On hold, monitoring the discussion.
880
+ cf. <CAPig+cRVdogY8VLXcftbY=n9tQ9wDo4YrnrdU6+pZ3ch6uhZGA@mail.gmail.com>
881
882
883
* ot/ref-filter-plug-leaks (2018-10-19) 3 commits
562
- - ref-filter: free item->value and item->value->s
563
- - ls-remote: release memory instead of UNLEAK
564
- - ref-filter: free memory from used_atom
884
+ (merged to 'next' on 2018-10-26 at a475cb6568)
885
+ + ref-filter: free item->value and item->value->s
886
+ + ls-remote: release memory instead of UNLEAK
887
+ + ref-filter: free memory from used_atom
888
889
Plugging a handful of memory leaks in the ref-filter codepath.
890
568
- Will merge to 'next'.
891
+ Will merge to 'master'.
892
893
894
* rv/send-email-cc-misc-by (2018-10-16) 3 commits
@@ -585,27 +908,9 @@ of the repositories listed at
908
Will merge to 'master'.
909
910
588
-* du/cherry-is-plumbing (2018-10-12) 1 commit
589
- (merged to 'next' on 2018-10-19 at ffe6c5449e)
590
- + doc: move git-cherry to plumbing
591
-
592
- Doc update to mark "git cherry" as a plumbing command.
593
-
594
- Will merge to 'master'.
595
-
596
-
597
-* du/get-tar-commit-id-is-plumbing (2018-10-12) 1 commit
598
- (merged to 'next' on 2018-10-16 at 23e7f018cd)
599
- + doc: move git-get-tar-commit-id to plumbing
600
-
601
- Doc update to mark "git get-tar-commit-id" as a plumbing command.
602
-
603
- Will merge to 'master'.
604
-
605
-
606
-* lm/range-diff-submodule-fix (2018-10-12) 1 commit
607
- (merged to 'next' on 2018-10-16 at 3e50d7a73b)
608
- + range-diff: allow to diff files regardless submodule
911
+* lm/range-diff-submodule-fix (2018-10-25) 1 commit
912
+ (merged to 'next' on 2018-10-25 at af387d8978)
913
+ + range-diff: allow to diff files regardless of submodule config
914
915
"git range-diff" did not work well when the compared ranges had
916
changes in submodules and the "--submodule=log" was used.
@@ -613,15 +918,6 @@ of the repositories listed at
918
Will merge to 'master'.
919
920
616
-* sb/diff-emit-line-ws-markup-cleanup (2018-10-12) 1 commit
617
- (merged to 'next' on 2018-10-16 at a68a6f0003)
618
- + diff.c: pass sign_index to emit_line_ws_markup
619
-
620
- Code clean-up.
621
-
622
- Will merge to 'master'.
623
-
624
-
921
* mk/use-size-t-in-zlib (2018-10-15) 1 commit
922
- zlib.c: use size_t for size
923
@@ -633,7 +929,7 @@ of the repositories listed at
929
* jc/rebase-in-c-5-test-typofix (2018-10-11) 1 commit
930
(merged to 'next' on 2018-10-19 at 08c9d86ffd)
931
+ rebase: fix typoes in error messages
636
- (this branch uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
932
+ (this branch uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
933
934
Typofix.
935
@@ -651,7 +947,7 @@ of the repositories listed at
947
(merged to 'next' on 2018-10-19 at 6db9b14495)
948
+ rebase -i: introduce the 'break' command
949
+ rebase -i: clarify what happens on a failed `exec`
654
- (this branch uses ag/rebase-i-in-c; is tangled with ag/sequencer-reduce-rewriting-todo, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
950
+ (this branch is used by js/rebase-i-shortopt; uses ag/rebase-i-in-c; is tangled with ag/sequencer-reduce-rewriting-todo, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
951
952
"git rebase -i" learned a new insn, 'break', that the user can
953
insert in the to-do list. Upon hitting it, the command returns
@@ -677,64 +973,17 @@ of the repositories listed at
973
Breaks interoperability.
974
975
680
-* ma/t7005-bash-workaround (2018-09-28) 1 commit
681
- (merged to 'next' on 2018-10-16 at 543e1e6574)
682
- + t7005-editor: quote filename to fix whitespace-issue
683
-
684
- Test fix.
685
-
686
- Will merge to 'master'.
687
-
688
-
689
-* rv/alias-help (2018-10-11) 3 commits
690
- (merged to 'next' on 2018-10-19 at f16bbfb3ef)
691
- + git-help.txt: document "git help cmd" vs "git cmd --help" for aliases
692
- + git.c: handle_alias: prepend alias info when first argument is -h
693
- + help: redirect to aliased commands for "git cmd --help"
694
-
695
- "git cmd --help" when "cmd" is aliased used to only say "cmd is
696
- aliased to ...". Now it shows that to the standard error stream
697
- and runs "git $cmd --help" where $cmd is the first word of the
698
- alias expansion.
699
-
700
- This could be misleading for those who alias a command with options
701
- (e.g. with "[alias] cpn = cherry-pick -n", "git cpn --help" would
702
- show the manual of "cherry-pick", and the reader would not be told
703
- to pay close attention to the part that describes the "--no-commit"
704
- option until closing the pager that showed the contents of the
705
- manual, if the pager is configured to restore the original screen,
706
- or would not be told at all, if the pager simply makes the message
707
- on the standard error scroll away.
708
-
709
- Will merge to 'master'.
710
-
711
-
976
* sb/strbuf-h-update (2018-09-29) 1 commit
713
- - strbuf.h: format according to coding guidelines
977
+ (merged to 'next' on 2018-10-26 at e4ad935cb0)
978
+ + strbuf.h: format according to coding guidelines
979
980
Code clean-up to serve as a BCP example.
981
717
- Will merge to 'next'.
982
+ Will merge to 'master'.
983
Further clean-up patches may need to follow soon before this
984
change escapes to 'master'.
985
986
722
-* sg/split-index-racefix (2018-10-12) 7 commits
723
- (merged to 'next' on 2018-10-16 at c1d6563c51)
724
- + split-index: BUG() when cache entry refers to non-existing shared entry
725
- + split-index: smudge and add racily clean cache entries to split index
726
- + split-index: don't compare cached data of entries already marked for split index
727
- + split-index: count the number of deleted entries
728
- + t1700-split-index: date back files to avoid racy situations
729
- + split-index: add tests to demonstrate the racy split index problem
730
- + t1700-split-index: document why FSMONITOR is disabled in this test script
731
-
732
- The codepath to support the experimental split-index mode had
733
- remaining "racily clean" issues fixed.
734
-
735
- Will merge to 'master'.
736
-
737
-
987
* ag/sequencer-reduce-rewriting-todo (2018-10-09) 16 commits
988
- rebase--interactive: move transform_todo_file() to rebase--interactive.c
989
- sequencer: fix a call to error() in transform_todo_file()
@@ -752,7 +1001,7 @@ of the repositories listed at
1001
- sequencer: make the todo_list structure public
1002
- sequencer: clear the number of items of a todo_list before parsing
1003
- Merge branch 'ag/rebase-i-in-c' into ag/sequencer-reduce-rewriting-todo
755
- (this branch uses ag/rebase-i-in-c; is tangled with js/rebase-i-break, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
1004
+ (this branch uses ag/rebase-i-in-c; is tangled with js/rebase-autostash-fix, js/rebase-i-break, js/rebase-i-shortopt, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
1005
1006
The scripted version of "git rebase -i" wrote and rewrote the todo
1007
list many times during a single step of its operation, and the
@@ -764,36 +1013,28 @@ of the repositories listed at
1013
Will hold, waiting for the "rebase-in-c" and "rebase-i-in-c" topics.
1014
1015
767
-* bc/editorconfig (2018-10-09) 2 commits
768
- (merged to 'next' on 2018-10-16 at 81461ae0fd)
769
- + editorconfig: indicate settings should be kept in sync
770
- + editorconfig: provide editor settings for Git developers
771
-
772
- To help developers, an EditorConfig file that attempts to follow
773
- the project convention has been added.
774
-
775
- Will merge to 'master'.
776
-
777
-
1016
* bc/hash-transition-part-15 (2018-10-15) 15 commits
779
- - rerere: convert to use the_hash_algo
780
- - submodule: make zero-oid comparison hash function agnostic
781
- - apply: rename new_sha1_prefix and old_sha1_prefix
782
- - apply: replace hard-coded constants
783
- - tag: express constant in terms of the_hash_algo
784
- - transport: use parse_oid_hex instead of a constant
785
- - upload-pack: express constants in terms of the_hash_algo
786
- - refs/packed-backend: express constants using the_hash_algo
787
- - packfile: express constants in terms of the_hash_algo
788
- - pack-revindex: express constants in terms of the_hash_algo
789
- - builtin/fetch-pack: remove constants with parse_oid_hex
790
- - builtin/mktree: remove hard-coded constant
791
- - builtin/repack: replace hard-coded constants
792
- - pack-bitmap-write: use GIT_MAX_RAWSZ for allocation
793
- - object_id.cocci: match only expressions of type 'struct object_id'
1017
+ (merged to 'next' on 2018-10-26 at 4ff8111b4b)
1018
+ + rerere: convert to use the_hash_algo
1019
+ + submodule: make zero-oid comparison hash function agnostic
1020
+ + apply: rename new_sha1_prefix and old_sha1_prefix
1021
+ + apply: replace hard-coded constants
1022
+ + tag: express constant in terms of the_hash_algo
1023
+ + transport: use parse_oid_hex instead of a constant
1024
+ + upload-pack: express constants in terms of the_hash_algo
1025
+ + refs/packed-backend: express constants using the_hash_algo
1026
+ + packfile: express constants in terms of the_hash_algo
1027
+ + pack-revindex: express constants in terms of the_hash_algo
1028
+ + builtin/fetch-pack: remove constants with parse_oid_hex
1029
+ + builtin/mktree: remove hard-coded constant
1030
+ + builtin/repack: replace hard-coded constants
1031
+ + pack-bitmap-write: use GIT_MAX_RAWSZ for allocation
1032
+ + object_id.cocci: match only expressions of type 'struct object_id'
1033
1034
More codepaths are moving away from hardcoded hash sizes.
1035
1036
+ Will merge to 'master'.
1037
+
1038
1039
* ch/subtree-build (2018-10-18) 3 commits
1040
(merged to 'next' on 2018-10-18 at f89fd5e6aa)
@@ -808,68 +1049,24 @@ of the repositories listed at
1049
Will merge to 'master'.
1050
1051
811
-* ds/test-multi-pack-index (2018-10-09) 3 commits
1052
+* ds/test-multi-pack-index (2018-10-26) 4 commits
1053
+ - packfile: close multi-pack-index in close_all_packs
1054
- multi-pack-index: define GIT_TEST_MULTI_PACK_INDEX
1055
- midx: close multi-pack-index on repack
1056
- midx: fix broken free() in close_midx()
1057
1058
Tests for the recently introduced multi-pack index machinery.
1059
818
- Expecting a reroll.
819
- cf. <8b5dbe3d-b382-bf48-b524-d9e8a074ac4d@gmail.com>
820
-
821
-
822
-* js/fuzzer (2018-10-15) 2 commits
823
- (merged to 'next' on 2018-10-19 at 649a2bf1fb)
824
- + fuzz: add fuzz testing for packfile indices.
825
- + fuzz: add basic fuzz testing target.
826
-
827
- An experiment to fuzz test a few areas, hopefully we can gain more
828
- coverage to various areas.
829
-
830
- Will merge to 'master'.
831
-
832
-
833
-* nd/per-worktree-ref-iteration (2018-10-07) 9 commits
834
- . SQUASH???
835
- . reflog expire: cover reflog from all worktrees
836
- . fsck: check HEAD and reflog from other worktrees
837
- . fsck: Move fsck_head_link() to get_default_heads() to avoid some globals
838
- . revision.c: better error reporting on ref from different worktrees
839
- . revision.c: correct a parameter name
840
- . refs: new ref types to make per-worktree refs visible to all worktrees
841
- . Add a place for (not) sharing stuff between worktrees
842
- . refs.c: indent with tabs, not spaces
843
-
844
- Expecting a reroll.
845
- cf. <CACsJy8DNHCxz1cL+6rFxnWvQQz3T7_j8+=5u8=CxjraRzM89mw@mail.gmail.com>
846
- Ejected for now, as it seems to break t2025 when in 'pu'.
847
-
848
-
849
-* np/log-graph-octopus-fix (2018-10-12) 1 commit
850
- (merged to 'next' on 2018-10-16 at aa00813683)
851
- + log: fix coloring of certain octopus merge shapes
852
-
853
- "git log --graph" showing an octopus merge sometimes miscounted the
854
- number of display columns it is consuming to show the merge and its
855
- parent commits, which has been corrected.
856
-
857
- Will merge to 'master'.
858
-
859
-
860
-* rs/subtree-fixes (2018-10-12) 5 commits
861
- (merged to 'next' on 2018-10-16 at be23c9343c)
862
- + subtree: performance improvement for finding unexpected parent commits
863
- (merged to 'next' on 2018-10-12 at 2b47258e04)
864
- + subtree: improve decision on merges kept in split
865
- + subtree: use commits before rejoins for splits
866
- + subtree: make --ignore-joins pay attention to adds
867
- + subtree: refactor split of a commit into standalone method
868
-
869
- Various subtree fixes.
1060
871
- Will merge to 'master'.
872
- Unless somebody objects, that is.
1061
+* nd/per-worktree-ref-iteration (2018-10-22) 8 commits
1062
+ - reflog expire: cover reflog from all worktrees
1063
+ - fsck: check HEAD and reflog from other worktrees
1064
+ - fsck: move fsck_head_link() to get_default_heads() to avoid some globals
1065
+ - revision.c: better error reporting on ref from different worktrees
1066
+ - revision.c: correct a parameter name
1067
+ - refs: new ref types to make per-worktree refs visible to all worktrees
1068
+ - Add a place for (not) sharing stuff between worktrees
1069
+ - refs.c: indent with tabs, not spaces
1070
1071
1072
* ds/reachable-topo-order (2018-10-18) 7 commits
@@ -887,25 +1084,14 @@ of the repositories listed at
1084
cf. <pull.25.v4.git.gitgitgadget@gmail.com>
1085
1086
890
-* ds/coverage-diff (2018-10-10) 1 commit
891
- (merged to 'next' on 2018-10-16 at c12b7279d9)
892
- + contrib: add coverage-diff script
893
-
894
- The result of coverage test can be combined with "git blame" to
895
- check the test coverage of code introduced recently with a new
896
- 'coverage-diff' tool (in contrib/).
897
-
898
- Will merge to 'master'.
899
-
900
-
901
-* sb/submodule-recursive-fetch-gets-the-tip (2018-10-18) 11 commits
902
- - fixup! repository: repo_submodule_init to take a submodule struct
903
- - builtin/fetch: check for submodule updates for non branch fetches
904
- - fetch: retry fetching submodules if needed objects were not fetched
905
- - submodule: fetch in submodules git directory instead of in worktree
1087
+* sb/submodule-recursive-fetch-gets-the-tip (2018-10-26) 11 commits
1088
+ - builtin/fetch: check for submodule updates in any ref update
1089
+ - fetch: try fetching submodules if needed objects were not fetched
1090
+ - submodule.c: fetch in submodules git directory instead of in worktree
1091
+ - submodule: migrate get_next_submodule to use repository structs
1092
- repository: repo_submodule_init to take a submodule struct
907
- - submodule.c: do not copy around submodule list
908
- - submodule.c: move global changed_submodule_names into fetch submodule struct
1093
+ - submodule: store OIDs in changed_submodule_names
1094
+ - submodule.c: tighten scope of changed_submodule_names struct
1095
- submodule.c: sort changed_submodule_names before searching it
1096
- submodule.c: fix indentation
1097
- sha1-array: provide oid_array_filter
@@ -920,7 +1106,7 @@ of the repositories listed at
1106
(merged to 'next' on 2018-10-19 at b734d81006)
1107
+ builtin rebase: prepare for builtin rebase -i
1108
+ Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c
923
- (this branch is used by pk/rebase-in-c-6-final; uses ag/rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix and js/rebase-i-break.)
1109
+ (this branch is used by js/rebase-autostash-fix and pk/rebase-in-c-6-final; uses ag/rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix, js/rebase-i-break and js/rebase-i-shortopt.)
1110
1111
"rebase" that has been rewritten learns the new calling convention
1112
used by "rebase -i" that was rewritten in C, tying the loose end
@@ -939,7 +1125,7 @@ of the repositories listed at
1125
cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
1126
1127
942
-* ao/submodule-wo-gitmodules-checked-out (2018-10-09) 10 commits
1128
+* ao/submodule-wo-gitmodules-checked-out (2018-10-26) 10 commits
1129
- t/helper: add test-submodule-nested-repo-config
1130
- submodule: support reading .gitmodules when it's not in the working tree
1131
- submodule: add a helper to check if it is safe to write to .gitmodules
@@ -994,7 +1180,7 @@ of the repositories listed at
1180
+ builtin rebase: handle the pre-rebase hook and --no-verify
1181
+ builtin rebase: support `git rebase --onto A...B`
1182
+ builtin rebase: support --onto
997
- (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c.)
1183
+ (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c.)
1184
1185
Rewrite "git rebase" in C.
1186
@@ -1010,7 +1196,7 @@ of the repositories listed at
1196
+ builtin rebase: support --abort
1197
+ builtin rebase: support --skip
1198
+ builtin rebase: support --continue
1013
- (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c and pk/rebase-in-c-2-basic.)
1199
+ (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c and pk/rebase-in-c-2-basic.)
1200
1201
Rewrite "git rebase" in C.
1202
@@ -1037,7 +1223,7 @@ of the repositories listed at
1223
+ builtin rebase: support --rerere-autoupdate
1224
+ builtin rebase: support --signoff
1225
+ builtin rebase: allow selecting the rebase "backend"
1040
- (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic and pk/rebase-in-c-3-acts.)
1226
+ (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic and pk/rebase-in-c-3-acts.)
1227
1228
Rewrite "git rebase" in C.
1229
@@ -1052,7 +1238,7 @@ of the repositories listed at
1238
+ builtin rebase: fast-forward to onto if it is a proper descendant
1239
+ builtin rebase: optionally pass custom reflogs to reset_head()
1240
+ builtin rebase: optionally auto-detect the upstream
1055
- (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts and pk/rebase-in-c-4-opts.)
1241
+ (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts and pk/rebase-in-c-4-opts.)
1242
1243
Rewrite "git rebase" in C.
1244
@@ -1062,7 +1248,7 @@ of the repositories listed at
1248
* pk/rebase-in-c-6-final (2018-10-11) 1 commit
1249
(merged to 'next' on 2018-10-19 at 52f1dadf69)
1250
+ rebase: default to using the builtin rebase
1065
- (this branch uses ag/rebase-i-in-c, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix and js/rebase-i-break.)
1251
+ (this branch is used by js/rebase-autostash-fix; uses ag/rebase-i-in-c, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix, js/rebase-i-break and js/rebase-i-shortopt.)
1252
1253
The final step of rewriting "rebase -i" in C.
1254
@@ -1138,7 +1324,7 @@ of the repositories listed at
1324
+ editor: add a function to launch the sequence editor
1325
+ rebase -i: rewrite append_todo_help() in C
1326
+ sequencer: make three functions and an enum from sequencer.c public
1141
- (this branch is used by ag/sequencer-reduce-rewriting-todo, js/rebase-i-break, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
1327
+ (this branch is used by ag/sequencer-reduce-rewriting-todo, js/rebase-autostash-fix, js/rebase-i-break, js/rebase-i-shortopt, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
1328
1329
Rewrite of the remaining "rebase -i" machinery in C.
1330
@@ -1150,7 +1336,7 @@ of the repositories listed at
1336
+ builtin/rebase: support running "git rebase <upstream>"
1337
+ rebase: refactor common shell functions into their own file
1338
+ rebase: start implementing it as a builtin
1153
- (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final.)
1339
+ (this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-autostash-fix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final.)
1340
1341
Rewrite of the "rebase" machinery in C.
1342