What's cooking (2018/07 #02)
Junio C Hamano committed
Jul 18, 2018 at 15:03 UTC
f59de5ad04b18866024fb298ddb276cb51d91673
1 file changed
+821
-555
whats-cooking.txt
+821
-555
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jul 2018, #01; Wed, 11)
4
-X-master-at: e3331758f12da22f4103eec7efe1b5304a9be5e9
5
-X-next-at: 985f88cf7ec28de3542ce98ac5b660da6e59caf0
3
+Subject: What's cooking in git.git (Jul 2018, #02; Wed, 18)
4
+X-master-at: b7bd9486b055c3f967a870311e704e3bb0654e4f
5
+X-next-at: 5c9ce644c390ec4ef3ba4adc94e7f4af17ade36b
6
7
-What's cooking in git.git (Jul 2018, #01; Wed, 11)
7
+What's cooking in git.git (Jul 2018, #02; Wed, 18)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,19 +12,651 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-The tip of 'next' has been rewound and it currently has only 4
16
-topics. Quite a many topics are cooking in 'pu' and need to be
17
-sifted into good bins (for 'next') and the remainder. Help is
18
-appreciated in that area ;-)
15
+Many topics have moved to 'master' and 'next' from 'next' to 'pu'
16
+respectively. As I needed to re-resolve semantic merge conflicts
17
+while reordering some topics (i.e. some that were merged earlier in
18
+'pu' are left in 'pu' while another topic that had interactions with
19
+them and required evil merge to resolve semantic conflicts
20
+leapfrogged to 'next'---the semantic conflict resolution then need
21
+to happen at a different merge than done earlier in 'pu' while
22
+rebuilding today's integration), I didn't have enough time to spend
23
+on new topics posted to the list in the past few days.
24
25
You can find the changes described here in the integration branches
26
of the repositories listed at
27
28
http://git-blame.blogspot.com/p/git-public-repositories.html
29
30
+--------------------------------------------------
31
+[Graduated to "master"]
32
+
33
+* ao/config-from-gitmodules (2018-06-26) 6 commits
34
+ (merged to 'next' on 2018-07-11 at 5d88dc6fb7)
35
+ + submodule-config: reuse config_from_gitmodules in repo_read_gitmodules
36
+ + submodule-config: pass repository as argument to config_from_gitmodules
37
+ + submodule-config: make 'config_from_gitmodules' private
38
+ + submodule-config: add helper to get 'update-clone' config from .gitmodules
39
+ + submodule-config: add helper function to get 'fetch' config from .gitmodules
40
+ + config: move config_from_gitmodules to submodule-config.c
41
+
42
+ Tighten the API to make it harder to misuse in-tree .gitmodules
43
+ file, even though it shares the same syntax with configuration
44
+ files, to read random configuration items from it.
45
+
46
+
47
+* bw/config-refer-to-gitsubmodules-doc (2018-06-21) 1 commit
48
+ (merged to 'next' on 2018-06-29 at da6f49d292)
49
+ + docs: link to gitsubmodules
50
+
51
+ Docfix.
52
+
53
+
54
+* bw/protocol-v2 (2018-06-22) 1 commit
55
+ (merged to 'next' on 2018-06-29 at 78090cc343)
56
+ + protocol-v2 doc: put HTTP headers after request
57
+
58
+ Doc fix.
59
+
60
+
61
+* dj/runtime-prefix (2018-06-26) 1 commit
62
+ (merged to 'next' on 2018-07-11 at 27d99fef94)
63
+ + Makefile: tweak sed invocation
64
+
65
+ POSIX portability fix in Makefile to fix a glitch introduced a few
66
+ releases ago.
67
+
68
+
69
+* ds/commit-graph (2018-06-28) 1 commit
70
+ (merged to 'next' on 2018-07-11 at d579f733ed)
71
+ + commit-graph: fix documentation inconsistencies
72
+
73
+ Docfix.
74
+
75
+
76
+* ds/ewah-cleanup (2018-06-21) 10 commits
77
+ (merged to 'next' on 2018-06-28 at 9cd7c0d54a)
78
+ + ewah: delete unused 'rlwit_discharge_empty()'
79
+ + ewah: drop ewah_serialize_native function
80
+ + ewah: drop ewah_deserialize function
81
+ + ewah_io: delete unused 'ewah_serialize()'
82
+ + ewah_bitmap: delete unused 'ewah_or()'
83
+ + ewah_bitmap: delete unused 'ewah_not()'
84
+ + ewah_bitmap: delete unused 'ewah_and_not()'
85
+ + ewah_bitmap: delete unused 'ewah_and()'
86
+ + ewah/bitmap.c: delete unused 'bitmap_each_bit()'
87
+ + ewah/bitmap.c: delete unused 'bitmap_clear()'
88
+
89
+ Originally merged to 'next' on 2018-06-22
90
+
91
+ Remove unused function definitions and declarations from ewah
92
+ bitmap subsystem.
93
+
94
+
95
+* en/merge-recursive-cleanup (2018-06-12) 6 commits
96
+ (merged to 'next' on 2018-06-28 at 1a3646eb7d)
97
+ + merge-recursive: add pointer about unduly complex looking code
98
+ + merge-recursive: rename conflict_rename_*() family of functions
99
+ + merge-recursive: clarify the rename_dir/RENAME_DIR meaning
100
+ + merge-recursive: align labels with their respective code blocks
101
+ + merge-recursive: fix numerous argument alignment issues
102
+ + merge-recursive: fix miscellaneous grammar error in comment
103
+
104
+ Originally merged to 'next' on 2018-06-19
105
+
106
+ Code cleanup.
107
+
108
+
109
+* en/rebase-i-microfixes (2018-06-27) 3 commits
110
+ (merged to 'next' on 2018-07-11 at d913ca0f77)
111
+ + git-rebase--merge: modernize "git-$cmd" to "git $cmd"
112
+ + Fix use of strategy options with interactive rebases
113
+ + t3418: add testcase showing problems with rebase -i and strategy options
114
+
115
+ Will merge to 'master'.
116
+
117
+
118
+* jk/branch-l-0-deprecation (2018-06-22) 3 commits
119
+ (merged to 'next' on 2018-06-29 at fac676dfb9)
120
+ + branch: deprecate "-l" option
121
+ + t: switch "branch -l" to "branch --create-reflog"
122
+ + t3200: unset core.logallrefupdates when testing reflog creation
123
+ (this branch is used by jk/branch-l-1-repurpose.)
124
+
125
+ The "-l" option in "git branch -l" is an unfortunate short-hand for
126
+ "--create-reflog", but many users, both old and new, somehow expect
127
+ it to be something else, perhaps "--list". This step warns when "-l"
128
+ is used as a short-hand for "--create-reflog" and warns about the
129
+ future repurposing of the it when it is used.
130
+
131
+
132
+* js/enhanced-version-info (2018-06-29) 1 commit
133
+ (merged to 'next' on 2018-07-11 at 815b2ea2bc)
134
+ + Makefile: fix the "built from commit" code
135
+
136
+ Build fix.
137
+
138
+
139
+* js/rebase-recreate-merge (2018-06-27) 1 commit
140
+ (merged to 'next' on 2018-07-11 at eb8f33aaef)
141
+ + rebase: fix documentation formatting
142
+
143
+ Docfix.
144
+
145
+
146
+* jt/remove-pack-bitmap-global (2018-06-21) 2 commits
147
+ (merged to 'next' on 2018-06-29 at 852857b04e)
148
+ + pack-bitmap: add free function
149
+ + pack-bitmap: remove bitmap_git global variable
150
+
151
+ The effort to move globals to per-repository in-core structure
152
+ continues.
153
+
154
+
155
+* ld/p423 (2018-06-19) 6 commits
156
+ (merged to 'next' on 2018-06-29 at af76acb664)
157
+ + git-p4: python3: fix octal constants
158
+ + git-p4: python3: use print() function
159
+ + git-p4: python3: basestring workaround
160
+ + git-p4: python3: remove backticks
161
+ + git-p4: python3: replace dict.has_key(k) with "k in dict"
162
+ + git-p4: python3: replace <> with !=
163
+
164
+ Code preparation to make "git p4" closer to be usable with Python 3.
165
+
166
+
167
+* mb/filter-branch-optim (2018-06-26) 1 commit
168
+ (merged to 'next' on 2018-07-11 at e43a0136c2)
169
+ + filter-branch: skip commits present on --state-branch
170
+
171
+ "git filter-branch" when used with the "--state-branch" option
172
+ still attempted to rewrite the commits whose filtered result is
173
+ known from the previous attempt (which is recorded on the state
174
+ branch); the command has been corrected not to waste cycles doing
175
+ so.
176
+
177
+
178
+* ms/core-icase-doc (2018-06-28) 1 commit
179
+ (merged to 'next' on 2018-07-11 at 8f0d71c32d)
180
+ + Documentation: declare "core.ignoreCase" as internal variable
181
+
182
+ Clarify that setting core.ignoreCase to deviate from reality would
183
+ not turn a case-incapable filesystem into a case-capable one.
184
+
185
+
186
+* pw/rebase-i-keep-reword-after-conflict (2018-06-19) 1 commit
187
+ (merged to 'next' on 2018-06-29 at 538337be74)
188
+ + sequencer: do not squash 'reword' commits when we hit conflicts
189
+
190
+ Bugfix for "rebase -i" corner case regression.
191
+
192
+
193
+* sb/mailmap (2018-06-29) 1 commit
194
+ (merged to 'next' on 2018-07-11 at d9dc53e374)
195
+ + .mailmap: merge different spellings of names
196
+
197
+ Will merge to 'master'.
198
+
199
+
200
+* sb/object-store-grafts (2018-05-18) 19 commits
201
+ (merged to 'next' on 2018-06-28 at 02f70d6302)
202
+ + commit: allow lookup_commit_graft to handle arbitrary repositories
203
+ + commit: allow prepare_commit_graft to handle arbitrary repositories
204
+ + shallow: migrate shallow information into the object parser
205
+ + path.c: migrate global git_path_* to take a repository argument
206
+ + cache: convert get_graft_file to handle arbitrary repositories
207
+ + commit: convert read_graft_file to handle arbitrary repositories
208
+ + commit: convert register_commit_graft to handle arbitrary repositories
209
+ + commit: convert commit_graft_pos() to handle arbitrary repositories
210
+ + shallow: add repository argument to is_repository_shallow
211
+ + shallow: add repository argument to check_shallow_file_for_update
212
+ + shallow: add repository argument to register_shallow
213
+ + shallow: add repository argument to set_alternate_shallow_file
214
+ + commit: add repository argument to lookup_commit_graft
215
+ + commit: add repository argument to prepare_commit_graft
216
+ + commit: add repository argument to read_graft_file
217
+ + commit: add repository argument to register_commit_graft
218
+ + commit: add repository argument to commit_graft_pos
219
+ + object: move grafts to object parser
220
+ + object-store: move object access functions to object-store.h
221
+ (this branch is used by jt/commit-graph-per-object-store and sb/object-store-lookup.)
222
+
223
+ Originally merged to 'next' on 2018-06-22
224
+
225
+ The conversion to pass "the_repository" and then "a_repository"
226
+ throughout the object access API continues.
227
+
228
+
229
+* sb/submodule-core-worktree (2018-06-19) 3 commits
230
+ (merged to 'next' on 2018-06-28 at 96e1a8dbd1)
231
+ + submodule deinit: unset core.worktree
232
+ + submodule: ensure core.worktree is set after update
233
+ + submodule: unset core.worktree if no working tree is present
234
+
235
+ Originally merged to 'next' on 2018-06-22
236
+
237
+ "git submodule" did not correctly adjust core.worktree setting that
238
+ indicates whether/where a submodule repository has its associated
239
+ working tree across various state transitions, which has been
240
+ corrected.
241
+
242
+
243
+* tb/grep-column (2018-06-22) 7 commits
244
+ (merged to 'next' on 2018-06-29 at 25dc70426e)
245
+ + contrib/git-jump/git-jump: jump to exact location
246
+ + grep.c: add configuration variables to show matched option
247
+ + builtin/grep.c: add '--column' option to 'git-grep(1)'
248
+ + grep.c: display column number of first match
249
+ + grep.[ch]: extend grep_opt to allow showing matched column
250
+ + grep.c: expose {,inverted} match column in match_line()
251
+ + Documentation/config.txt: camel-case lineNumber for consistency
252
+ (this branch is used by tb/grep-only-matching.)
253
+
254
+ "git grep" learned the "--column" option that gives not just the
255
+ line number but the column number of the hit.
256
+
257
+
258
+* tz/exclude-doc-smallfixes (2018-06-27) 2 commits
259
+ (merged to 'next' on 2018-07-11 at 5134f1ca72)
260
+ + dir.c: fix typos in core.excludesfile comment
261
+ + gitignore.txt: clarify default core.excludesfile path
262
+
263
+ Doc updates.
264
+
265
+
266
+* vs/typofixes (2018-06-22) 1 commit
267
+ (merged to 'next' on 2018-06-29 at 665c8db2f7)
268
+ + Documentation: spelling and grammar fixes
269
+
270
+ Doc fix.
271
+
272
+
273
+* xy/format-patch-prereq-patch-id-fix (2018-06-19) 1 commit
274
+ (merged to 'next' on 2018-06-29 at 0dffc46ce2)
275
+ + format-patch: clear UNINTERESTING flag before prepare_bases
276
+
277
+ Recently added "--base" option to "git format-patch" command did
278
+ not correctly generate prereq patch ids.
279
+
280
--------------------------------------------------
281
[New Topics]
282
283
+* am/sequencer-author-script-fix (2018-07-18) 1 commit
284
+ - sequencer.c: terminate the last line of author-script properly
285
+
286
+ The author-script that records the author information created by
287
+ the sequencer machinery lacked the closing single quote on the last
288
+ entry.
289
+
290
+ Fixing this alone may or may not break the reader that may have
291
+ been compensating for this bogus writer. I think I saw another fix
292
+ to the same source file posted today---if we are fixing, we should
293
+ fix them all at the same time to keep the reader and the writer in
294
+ sync.
295
+
296
+
297
+* bc/sequencer-export-work-tree-as-well (2018-07-16) 1 commit
298
+ - sequencer: pass absolute GIT_WORK_TREE to exec commands
299
+
300
+ "git rebase" started exporting GIT_DIR environment variable and
301
+ exposing it to hook scripts when part of it got rewritten in C.
302
+ Instead of matching the old scripted Porcelains' behaviour,
303
+ compensate by also exporting GIT_WORK_TREE environment as well to
304
+ lessen the damage. This can harm existing hooks that want to
305
+ operate on different repository, but the current behaviour is
306
+ already broken for them anyway.
307
+
308
+ Will merge to 'next'.
309
+
310
+
311
+* bp/test-drop-caches-for-windows (2018-07-12) 1 commit
312
+ - handle lower case drive letters on Windows
313
+
314
+ A test helper update for Windows.
315
+
316
+ Will merge to 'next'.
317
+
318
+
319
+* en/abort-df-conflict-fixes (2018-07-16) 2 commits
320
+ - read-cache: fix directory/file conflict handling in read_index_unmerged()
321
+ - t1015: demonstrate directory/file conflict recovery failures
322
+
323
+ "git merge --abort" etc. did not clean things up properly when
324
+ there were conflicted entries in certain order that are involved
325
+ in D/F conflicts. This has been corrected.
326
+
327
+ This may have to be rebased on an older maintenance track before
328
+ moving forward.
329
+
330
+
331
+* es/chain-lint-in-subshell (2018-07-17) 10 commits
332
+ - t/chainlint: add chainlint "specialized" test cases
333
+ - t/chainlint: add chainlint "complex" test cases
334
+ - t/chainlint: add chainlint "cuddled" test cases
335
+ - t/chainlint: add chainlint "loop" and "conditional" test cases
336
+ - t/chainlint: add chainlint "nested subshell" test cases
337
+ - t/chainlint: add chainlint "one-liner" test cases
338
+ - t/chainlint: add chainlint "whitespace" test cases
339
+ - t/chainlint: add chainlint "basic" test cases
340
+ - t/Makefile: add machinery to check correctness of chainlint.sed
341
+ - t/test-lib: teach --chain-lint to detect broken &&-chains in subshells
342
+ (this branch uses es/test-fixes.)
343
+
344
+ Look for broken "&&" chains that are hidden in subshell, many of
345
+ which have been found and corrected.
346
+
347
+ Will merge to 'next'.
348
+
349
+
350
+* es/test-lint-one-shot-export (2018-07-16) 5 commits
351
+ (merged to 'next' on 2018-07-18 at 26a6124963)
352
+ + t/check-non-portable-shell: detect "FOO=bar shell_func"
353
+ + t/check-non-portable-shell: make error messages more compact
354
+ + t/check-non-portable-shell: stop being so polite
355
+ + t6046/t9833: fix use of "VAR=VAL cmd" with a shell function
356
+ + Merge branch 'jc/t3404-one-shot-export-fix' into es/test-lint-one-shot-export
357
+ (this branch uses jc/t3404-one-shot-export-fix.)
358
+
359
+ Look for broken use of "vAR=VAL shell_func" in test scripts as part
360
+ of test-lint.
361
+
362
+ Will merge to 'master'.
363
+
364
+
365
+* hs/gpgsm (2018-07-18) 7 commits
366
+ - gpg-interface t: extend the existing GPG tests with GPGSM
367
+ - gpg-interface: introduce new signature format "x509" using gpgsm
368
+ - gpg-interface: introduce new config to select per gpg format program
369
+ - gpg-interface: do not hardcode the key string len anymore
370
+ - gpg-interface: introduce an abstraction for multiple gpg formats
371
+ - t/t7510: check the validation of the new config gpg.format
372
+ - gpg-interface: add new config to select how to sign a commit
373
+ (this branch uses hs/push-cert-check-cleanup.)
374
+
375
+ Teach "git tag -s" etc. a few configuration varaibles (gpg.format
376
+ that can be set to "openpgp" or "x509", and gpg.<format>.program
377
+ that is used to specify what program to use to deal with the format)
378
+ to allow x.509 certs with CMS via "gpgsm" to be used instead of
379
+ openpgp via "gnupg".
380
+
381
+ I think this round is mostly ready, except for a minor nit in the
382
+ last step. I do not mind merging this to 'next' and leave fixing
383
+ of the test to a later clean-up.
384
+
385
+
386
+* jc/t3404-one-shot-export-fix (2018-07-12) 1 commit
387
+ (merged to 'next' on 2018-07-18 at e15a79dca7)
388
+ + t3404: fix use of "VAR=VAL cmd" with a shell function
389
+ (this branch is used by es/test-lint-one-shot-export.)
390
+
391
+ Correct a broken use of "VAR=VAL shell_func" in a test.
392
+
393
+ Will merge to 'master'.
394
+
395
+
396
+* jk/has-uncommitted-changes-fix (2018-07-11) 1 commit
397
+ - has_uncommitted_changes(): fall back to empty tree
398
+
399
+ "git pull --rebase" on a corrupt HEAD caused a segfault. In
400
+ general we substitute an empty tree object when running the in-core
401
+ equivalent of the diff-index command, and the codepath has been
402
+ corrected to do so as well to fix this issue.
403
+
404
+ Will merge to 'next'.
405
+
406
+
407
+* jm/send-email-tls-auth-on-batch (2018-07-16) 1 commit
408
+ - send-email: fix tls AUTH when sending batch
409
+
410
+ "git send-email" when using in a batched mode that limits the
411
+ number of messages sent in a single SMTP session lost the contents
412
+ of the variable used to choose between tls/ssl, unable to send the
413
+ second and later batches, which has been fixed.
414
+
415
+ Will merge to 'next'.
416
+
417
+ This is marked to be merged to 'next' already, but I do not mind
418
+ getting an updated version with an improved log message before that
419
+ happens.
420
+
421
+
422
+* jn/gc-auto (2018-07-17) 3 commits
423
+ - gc: do not return error for prior errors in daemonized mode
424
+ - gc: exit with status 128 on failure
425
+ - gc: improve handling of errors reading gc.log
426
+
427
+ "gc --auto" ended up calling exit(-1) upon error, which has been
428
+ corrected to use exit(1). Also the error reporting behaviour when
429
+ daemonized has been updated to exit with zero status when stopping
430
+ due to a previously discovered error (which implies there is no
431
+ point running gc to improve the situation); we used to exit with
432
+ failure in such a case.
433
+
434
+ Under discussion.
435
+ cf. <20180717201348.GD26218@sigill.intra.peff.net>
436
+
437
+
438
+* js/rebase-merge-octopus (2018-07-11) 3 commits
439
+ - rebase --rebase-merges: adjust man page for octopus support
440
+ - rebase --rebase-merges: add support for octopus merges
441
+ - merge: allow reading the merge commit message from a file
442
+
443
+ "git rebase --rebase-merges" mode now handles octopus merges as
444
+ well.
445
+
446
+ Will merge to 'next'.
447
+
448
+
449
+* jt/fetch-negotiator-skipping (2018-07-16) 1 commit
450
+ - negotiator/skipping: skip commits during fetch
451
+ (this branch uses jt/fetch-pack-negotiator; is tangled with jt/fetch-nego-tip.)
452
+
453
+ Add a server-side knob to skip commits in exponential/fibbonacci
454
+ stride in an attempt to cover wider swath of history with a smaller
455
+ number of iterations, potentially accepting a larger packfile
456
+ transfer, instead of going back one commit a time during common
457
+ ancestor discovery during the "git fetch" transaction.
458
+
459
+ Will merge to 'next'.
460
+
461
+
462
+* jt/tags-to-promised-blobs-fix (2018-07-16) 2 commits
463
+ - tag: don't warn if target is missing but promised
464
+ - revision: tolerate promised targets of tags
465
+ (this branch uses bw/ref-in-want, jt/connectivity-check-after-unshallow and jt/partial-clone-fsck-connectivity.)
466
+
467
+ The lazy clone support had a few places where missing but promised
468
+ objects were not correctly tolerated, which have been fixed.
469
+
470
+ Will merge to 'next'.
471
+
472
+
473
+* nd/command-list (2018-07-16) 1 commit
474
+ (merged to 'next' on 2018-07-18 at 77ed2a3914)
475
+ + vcbuild/README: update to accommodate for missing common-cmds.h
476
+
477
+ Build doc update for Windows.
478
+
479
+ Will merge to 'master'.
480
+
481
+
482
+* sb/blame-color (2018-07-16) 1 commit
483
+ (merged to 'next' on 2018-07-18 at c319268502)
484
+ + blame: prefer xsnprintf to strcpy for colors
485
+
486
+ Code clean-up.
487
+
488
+ Will merge to 'master'.
489
+
490
+
491
+* sb/submodule-update-in-c (2018-07-17) 6 commits
492
+ - submodule--helper: introduce new update-module-mode helper
493
+ - builtin/submodule--helper: factor out method to update a single submodule
494
+ - builtin/submodule--helper: store update_clone information in a struct
495
+ - builtin/submodule--helper: factor out submodule updating
496
+ - git-submodule.sh: rename unused variables
497
+ - git-submodule.sh: align error reporting for update mode to use path
498
+
499
+ "git submodule update" is getting rewritten piece-by-piece into C.
500
+
501
+ It seems to pass its own self-tests standalone, but seems to break
502
+ horribly when merged to 'pu'.
503
+
504
+
505
+* sg/httpd-test-unflake (2018-07-12) 3 commits
506
+ - t/lib-httpd: avoid occasional failures when checking access.log
507
+ - t/lib-httpd: add the strip_access_log() helper function
508
+ - t5541: clean up truncating access log
509
+
510
+ httpd tests saw occasional breakage due to the way its access log
511
+ gets inspected by the tests, which has been updated to make them
512
+ less flaky.
513
+
514
+ Will merge to 'next'.
515
+
516
+
517
+* sl/commit-dry-run-with-short-output-fix (2018-07-17) 3 commits
518
+ - commit: fix exit code for --short/--porcelain
519
+ - wt-status: teach wt_status_collect about merges in progress
520
+ - t7501: add merge conflict tests for dry run
521
+
522
+ Under discussion.
523
+ cf. <xmqqpnzlpyux.fsf@gitster-ct.c.googlers.com>
524
+
525
+
526
+* tg/rerere (2018-07-16) 11 commits
527
+ - rerere: recalculate conflict ID when unresolved conflict is committed
528
+ - rerere: teach rerere to handle nested conflicts
529
+ - rerere: return strbuf from handle path
530
+ - rerere: factor out handle_conflict function
531
+ - rerere: only return whether a path has conflicts or not
532
+ - rerere: fix crash when conflict goes unresolved
533
+ - rerere: add documentation for conflict normalization
534
+ - rerere: mark strings for translation
535
+ - rerere: wrap paths in output in sq
536
+ - rerere: lowercase error messages
537
+ - rerere: unify error messages when read_cache fails
538
+
539
+
540
+* wc/find-commit-with-pattern-on-detached-head (2018-07-12) 1 commit
541
+ (merged to 'next' on 2018-07-18 at 334d2420c0)
542
+ + sha1-name.c: for ":/", find detached HEAD commits
543
+
544
+ "git rev-parse ':/substring'" did not consider the history leading
545
+ only to HEAD when looking for a commit with the given substring,
546
+ when the HEAD is detached. This has been fixed.
547
+
548
+ Will merge to 'master'.
549
+
550
+
551
+* jk/ui-color-always-to-auto (2018-07-18) 1 commit
552
+ - Documentation: fix --color option formatting
553
+
554
+--------------------------------------------------
555
+[Stalled]
556
+
557
+* pw/add-p-select (2018-03-16) 3 commits
558
+ - add -p: optimize line selection for short hunks
559
+ - add -p: allow line selection to be inverted
560
+ - add -p: select individual hunk lines
561
+
562
+ "git add -p" interactive interface learned to let users choose
563
+ individual added/removed lines to be used in the operation, instead
564
+ of accepting or rejecting a whole hunk.
565
+
566
+ Expecting a reroll to reignite the discussion.
567
+ cf. <9895c7b7-eac4-28c1-90c6-443acd1131b7@talktalk.net>
568
+
569
+
570
+* hn/bisect-first-parent (2018-04-21) 1 commit
571
+ - bisect: create 'bisect_flags' parameter in find_bisection()
572
+
573
+ Preliminary code update to allow passing more flags down the
574
+ bisection codepath in the future.
575
+
576
+ We do not add random code that does not have real users to our
577
+ codebase, so let's have it wait until such a real code materializes
578
+ before too long.
579
+
580
+
581
+* av/fsmonitor-updates (2018-01-04) 6 commits
582
+ - fsmonitor: use fsmonitor data in `git diff`
583
+ - fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
584
+ - fsmonitor: make output of test-dump-fsmonitor more concise
585
+ - fsmonitor: update helper tool, now that flags are filled later
586
+ - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
587
+ - dir.c: update comments to match argument name
588
+
589
+ Code clean-up on fsmonitor integration, plus optional utilization
590
+ of the fsmonitor data in diff-files.
591
+
592
+ Waiting for an update.
593
+ cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
594
+
595
+
596
+* pb/bisect-helper-2 (2018-06-13) 8 commits
597
+ - t6030: make various test to pass GETTEXT_POISON tests
598
+ - bisect--helper: `bisect_start` shell function partially in C
599
+ - bisect--helper: `get_terms` & `bisect_terms` shell function in C
600
+ - bisect--helper: `bisect_next_check` shell function in C
601
+ - bisect--helper: `check_and_set_terms` shell function in C
602
+ - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
603
+ - bisect--helper: `bisect_write` shell function in C
604
+ - bisect--helper: `bisect_reset` shell function in C
605
+
606
+ Expecting a reroll.
607
+ cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
608
+
609
+ I just rebased the topic to a newer base as it did not build
610
+ standalone with the base I originally queued the topic on, but
611
+ otherwise there is no update to address any of the review comments
612
+ in the thread above---we are still waiting for a reroll.
613
+
614
+
615
+* mk/http-backend-content-length (2018-06-11) 3 commits
616
+ - http-backend: respect CONTENT_LENGTH for receive-pack
617
+ - http-backend: respect CONTENT_LENGTH as specified by rfc3875
618
+ - http-backend: cleanup writing to child process
619
+
620
+ The http-backend (used for smart-http transport) used to slurp the
621
+ whole input until EOF, without paying attention to CONTENT_LENGTH
622
+ that is supplied in the environment and instead expecting the Web
623
+ server to close the input stream. This has been fixed.
624
+
625
+
626
+* jk/drop-ancient-curl (2017-08-09) 5 commits
627
+ - http: #error on too-old curl
628
+ - curl: remove ifdef'd code never used with curl >=7.19.4
629
+ - http: drop support for curl < 7.19.4
630
+ - http: drop support for curl < 7.16.0
631
+ - http: drop support for curl < 7.11.1
632
+
633
+ Some code in http.c that has bitrot is being removed.
634
+
635
+ Expecting a reroll.
636
+
637
+
638
+* mk/use-size-t-in-zlib (2017-08-10) 1 commit
639
+ . zlib.c: use size_t for size
640
+
641
+ The wrapper to call into zlib followed our long tradition to use
642
+ "unsigned long" for sizes of regions in memory, which have been
643
+ updated to use "size_t".
644
+
645
+ Needs resurrecting by making sure the fix is good and still applies
646
+ (or adjusted to today's codebase).
647
+
648
+--------------------------------------------------
649
+[Cooking]
650
+
651
+* jh/json-writer (2018-07-16) 1 commit
652
+ - json_writer: new routines to create JSON data
653
+
654
+ Preparatory code to later add json output for telemetry data.
655
+
656
+ A series on top that adds telemetry data exists but hasn't been
657
+ picked up yet.
658
+
659
+
660
* ag/rebase-i-in-c (2018-07-10) 13 commits
661
- rebase -i: rewrite the rest of init_revisions_and_shortrevisions in C
662
- rebase -i: implement the logic to initialize the variable $revision in C
@@ -40,7 +672,7 @@ of the repositories listed at
672
- rebase--interactive: rewrite append_todo_help() in C
673
- sequencer: make two functions and an enum from sequencer.c public
674
43
- Piecemeal rewrite of the remaining "rebase -i" machinery in C.
675
+ Piecemeal rewrite of the remaining "rebase -i" machinery in C.
676
677
Expecting a reroll.
678
@@ -49,20 +681,15 @@ of the repositories listed at
681
682
683
* en/apply-comment-fix (2018-06-28) 1 commit
52
- - apply: fix grammar error in comment
684
+ (merged to 'next' on 2018-07-18 at 31d818f17d)
685
+ + apply: fix grammar error in comment
686
54
- Will merge to 'next'.
687
+ Will merge to 'master'.
688
689
690
* en/t5407-rebase-m-fix (2018-06-28) 1 commit
58
- - t5407: fix test to cover intended arguments
59
-
60
- Will merge to 'next'.
61
-
62
-
63
-* sb/mailmap (2018-06-29) 1 commit
64
- (merged to 'next' on 2018-07-11 at d9dc53e374)
65
- + .mailmap: merge different spellings of names
691
+ (merged to 'next' on 2018-07-18 at 459875daeb)
692
+ + t5407: fix test to cover intended arguments
693
694
Will merge to 'master'.
695
@@ -101,7 +728,7 @@ of the repositories listed at
728
- object: add repository argument to lookup_object
729
- object: add repository argument to parse_object
730
- Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
104
- (this branch uses sb/object-store-grafts.)
731
+ (this branch is used by jt/commit-graph-per-object-store.)
732
733
lookup_commit_reference() and friends have been updated to find
734
in-core object for a specific in-core repository instance.
@@ -110,40 +737,43 @@ of the repositories listed at
737
738
739
* ag/rebase-p (2018-07-06) 1 commit
113
- - git-rebase--preserve-merges: fix formatting of todo help message
740
+ (merged to 'next' on 2018-07-18 at c36ebba99b)
741
+ + git-rebase--preserve-merges: fix formatting of todo help message
742
743
The help message shown in the editor to edit todo list in "rebase -p"
744
has regressed recently, which has been corrected.
745
118
- Will merge to 'next'.
746
+ Will merge to 'master'.
747
748
749
* bb/pedantic (2018-07-09) 8 commits
122
- - utf8.c: avoid char overflow
123
- - string-list.c: avoid conversion from void * to function pointer
124
- - sequencer.c: avoid empty statements at top level
125
- - convert.c: replace "\e" escapes with "\033".
126
- - fixup! refs/refs-internal.h: avoid forward declaration of an enum
127
- - refs/refs-internal.h: avoid forward declaration of an enum
128
- - fixup! connect.h: avoid forward declaration of an enum
129
- - connect.h: avoid forward declaration of an enum
750
+ (merged to 'next' on 2018-07-18 at e9d075e8ed)
751
+ + utf8.c: avoid char overflow
752
+ + string-list.c: avoid conversion from void * to function pointer
753
+ + sequencer.c: avoid empty statements at top level
754
+ + convert.c: replace "\e" escapes with "\033".
755
+ + fixup! refs/refs-internal.h: avoid forward declaration of an enum
756
+ + refs/refs-internal.h: avoid forward declaration of an enum
757
+ + fixup! connect.h: avoid forward declaration of an enum
758
+ + connect.h: avoid forward declaration of an enum
759
760
The codebase has been updated to compile cleanly with -pedantic
761
option.
762
134
- Will merge to 'next'.
763
+ Will merge to 'master'.
764
765
766
* bb/unicode-11-width (2018-07-09) 1 commit
138
- - unicode: update the width tables to Unicode 11
767
+ (merged to 'next' on 2018-07-18 at 075648ed37)
768
+ + unicode: update the width tables to Unicode 11
769
770
The character display width table has been updated to match the
771
latest Unicode standard.
772
143
- Will merge to 'next'.
773
+ Will merge to 'master'.
774
775
146
-* bc/object-id (2018-07-09) 17 commits
776
+* bc/object-id (2018-07-16) 16 commits
777
- pretty: switch hard-coded constants to the_hash_algo
778
- sha1-file: convert constants to uses of the_hash_algo
779
- log-tree: switch GIT_SHA1_HEXSZ to the_hash_algo->hexsz
@@ -154,7 +784,6 @@ of the repositories listed at
784
- builtin/update-index: simplify parsing of cacheinfo
785
- builtin/update-index: convert to using the_hash_algo
786
- refs/files-backend: use the_hash_algo for writing refs
157
- - commit: increase commit message buffer size
787
- sha1-name: use the_hash_algo when parsing object names
788
- strbuf: allocate space with GIT_MAX_HEXSZ
789
- commit: express tree entry constants in terms of the_hash_algo
@@ -164,15 +793,15 @@ of the repositories listed at
793
794
Conversion from uchar[40] to struct object_id continues.
795
167
- Expecting a reroll.
168
- cf. <20180709232656.GA535220@genre.crustytoothpaste.net>
796
+ Will merge to 'next'.
797
798
799
* bc/send-email-auto-cte (2018-07-09) 4 commits
172
- - docs: correct RFC specifying email line length
173
- - send-email: automatically determine transfer-encoding
174
- - send-email: accept long lines with suitable transfer encoding
175
- - send-email: add an auto option for transfer encoding
800
+ (merged to 'next' on 2018-07-18 at d16c2a301a)
801
+ + docs: correct RFC specifying email line length
802
+ + send-email: automatically determine transfer-encoding
803
+ + send-email: accept long lines with suitable transfer encoding
804
+ + send-email: add an auto option for transfer encoding
805
806
The content-transfer-encoding of the message "git send-email" sends
807
out by default was 8bit, which can cause trouble when there is an
@@ -180,7 +809,7 @@ of the repositories listed at
809
automatically switch to quoted-printable when there is such a line
810
in the payload has been introduced and is made the default.
811
183
- Will merge to 'next'.
812
+ Will merge to 'master'.
813
814
815
* en/dirty-merge-fixes (2018-07-11) 9 commits
@@ -215,7 +844,8 @@ of the repositories listed at
844
Will merge to 'next'.
845
846
218
-* en/t6036-recursive-corner-cases (2018-07-06) 1 commit
847
+* en/t6036-recursive-corner-cases (2018-07-12) 2 commits
848
+ - t6036: fix broken && chain in sub-shell
849
- t6036: add lots of detail for directory/file conflicts in recursive case
850
851
Tests to cover more D/F conflict cases have been added for
@@ -249,7 +879,8 @@ of the repositories listed at
879
Will merge to 'next'.
880
881
252
-* es/test-fixes (2018-07-03) 25 commits
882
+* es/test-fixes (2018-07-17) 26 commits
883
+ - t5608: fix broken &&-chain
884
- t9119: fix broken &&-chains
885
- t9000-t9999: fix broken &&-chains
886
- t7000-t7999: fix broken &&-chains
@@ -275,6 +906,7 @@ of the repositories listed at
906
- t: use sane_unset() rather than 'unset' with broken &&-chain
907
- t: use test_write_lines() instead of series of 'echo' commands
908
- t: use test_might_fail() instead of manipulating exit code manually
909
+ (this branch is used by es/chain-lint-in-subshell.)
910
911
Test clean-up and corrections.
912
@@ -282,43 +914,51 @@ of the repositories listed at
914
915
916
* jk/empty-pick-fix (2018-07-11) 2 commits
285
- - sequencer: don't say BUG on bogus input
286
- - sequencer: handle empty-set cases consistently
917
+ (merged to 'next' on 2018-07-18 at 43bfa862f2)
918
+ + sequencer: don't say BUG on bogus input
919
+ + sequencer: handle empty-set cases consistently
920
921
Handling of an empty range by "git cherry-pick" was inconsistent
922
depending on how the range ended up to be empty, which has been
923
corrected.
924
292
- Will merge to 'next'.
925
+ Will merge to 'master'.
926
927
928
* jk/fetch-all-peeled-fix (2018-07-06) 1 commit
296
- - t5500: prettify non-commit tag tests
929
+ (merged to 'next' on 2018-07-18 at d06c6f1665)
930
+ + t5500: prettify non-commit tag tests
931
932
Test modernization.
933
300
- Will merge to 'next'.
934
+ Will merge to 'master'.
935
936
937
* jk/for-each-ref-icase (2018-07-03) 3 commits
304
- - ref-filter: avoid backend filtering with --ignore-case
305
- - for-each-ref: consistently pass WM_IGNORECASE flag
306
- - t6300: add a test for --ignore-case
938
+ (merged to 'next' on 2018-07-18 at 4c86d62adb)
939
+ + ref-filter: avoid backend filtering with --ignore-case
940
+ + for-each-ref: consistently pass WM_IGNORECASE flag
941
+ + t6300: add a test for --ignore-case
942
943
The "--ignore-case" option of "git for-each-ref" (and its friends)
944
did not work correctly, which has been fixed.
945
311
- Will merge to 'next'.
946
+ Will merge to 'master'.
947
948
314
-* jk/fsck-gitmodules-gently (2018-07-03) 5 commits
315
- - fsck: silence stderr when parsing .gitmodules
949
+* jk/fsck-gitmodules-gently (2018-07-16) 6 commits
950
+ - fsck: downgrade gitmodulesParse default to "info"
951
+ - fsck: split ".gitmodules too large" error from parse failure
952
- fsck: silence stderr when parsing .gitmodules
953
- config: add options parameter to git_config_from_mem
954
- config: add CONFIG_ERROR_SILENT handler
955
- config: turn die_on_error into caller-facing enum
956
321
- What's the status of this one?
957
+ Recent "security fix" to pay attention to contents of ".gitmodules"
958
+ while accepting "git push" was a bit overly strict than necessary,
959
+ which has been adjusted.
960
+
961
+ Will merge to 'next'.
962
963
964
* js/range-diff (2018-07-09) 20 commits
@@ -351,26 +991,27 @@ of the repositories listed at
991
a different name.
992
993
354
-* jt/commit-graph-per-object-store (2018-07-09) 6 commits
355
- . commit-graph: add repo arg to graph readers
356
- . commit-graph: store graph in struct object_store
357
- . commit-graph: add free_commit_graph
358
- . commit-graph: add missing forward declaration
359
- . object-store: add missing include
360
- . commit-graph: refactor preparing commit graph
361
- (this branch uses ds/commit-graph-fsck.)
994
+* jt/commit-graph-per-object-store (2018-07-17) 7 commits
995
+ - commit-graph: add repo arg to graph readers
996
+ - commit-graph: store graph in struct object_store
997
+ - commit-graph: add free_commit_graph
998
+ - commit-graph: add missing forward declaration
999
+ - object-store: add missing include
1000
+ - commit-graph: refactor preparing commit graph
1001
+ - Merge branch 'ds/commit-graph-fsck' into jt/commit-graph-per-object-store
1002
+ (this branch uses ds/commit-graph-fsck and sb/object-store-lookup.)
1003
1004
The singleton commit-graph in-core instance is made per in-core
1005
repository instance.
1006
366
- Expecting a reroll, as it breaks 32-bit build.
367
- cf. https://travis-ci.org/git/git/jobs/402422108
368
-
1007
+ Will merge to 'next'.
1008
+
1009
1010
* jt/partial-clone-fsck-connectivity (2018-07-09) 2 commits
371
- - clone: check connectivity even if clone is partial
372
- - upload-pack: send refs' objects despite "filter"
373
- (this branch uses bw/ref-in-want and jt/connectivity-check-after-unshallow.)
1011
+ (merged to 'next' on 2018-07-18 at 968fd9c9f0)
1012
+ + clone: check connectivity even if clone is partial
1013
+ + upload-pack: send refs' objects despite "filter"
1014
+ (this branch is used by jt/tags-to-promised-blobs-fix; uses bw/ref-in-want and jt/connectivity-check-after-unshallow.)
1015
1016
Partial clone support of "git clone" has been updated to correctly
1017
validate the objects it receives from the other side. The server
@@ -378,7 +1019,7 @@ of the repositories listed at
1019
requested, even if they may match the filtering criteria (e.g. when
1020
doing a "lazy blob" partial clone).
1021
381
- Will merge to 'next'.
1022
+ Will merge to 'master'.
1023
1024
1025
* kg/gc-auto-windows-workaround (2018-07-09) 1 commit
@@ -393,12 +1034,13 @@ of the repositories listed at
1034
1035
1036
* kn/userdiff-php (2018-07-06) 2 commits
396
- - userdiff: support new keywords in PHP hunk header
397
- - t4018: add missing test cases for PHP
1037
+ (merged to 'next' on 2018-07-18 at 9a533dc33a)
1038
+ + userdiff: support new keywords in PHP hunk header
1039
+ + t4018: add missing test cases for PHP
1040
1041
The userdiff pattern for .php has been updated.
1042
401
- Will merge to 'next'.
1043
+ Will merge to 'master'.
1044
1045
1046
* lt/date-human (2018-07-09) 1 commit
@@ -406,22 +1048,29 @@ of the repositories listed at
1048
1049
1050
* mh/fast-import-no-diff-delta-empty (2018-07-06) 1 commit
409
- - fast-import: do not call diff_delta() with empty buffer
1051
+ (merged to 'next' on 2018-07-18 at eb393871f4)
1052
+ + fast-import: do not call diff_delta() with empty buffer
1053
1054
"git fast-import" has been updated to avoid attempting to create
1055
delta against a zero-byte-long string, which is pointless.
1056
414
- Will merge to 'next'.
1057
+ Will merge to 'master'.
1058
+
1059
1060
+* ot/ref-filter-object-info (2018-07-17) 5 commits
1061
+ - ref-filter: use oid_object_info() to get object
1062
+ - ref-filter: merge get_obj and get_object
1063
+ - ref-filter: initialize eaten variable
1064
+ - ref-filter: fill empty fields with empty values
1065
+ - ref-filter: add info_source to valid_atom
1066
417
-* ot/ref-filter-object-info (2018-07-09) 4 commits
418
- . ref-filter: use oid_object_info() to get object
419
- . ref-filter: merge get_obj and get_object
420
- . ref-filter: add empty values to technical fields
421
- . ref-filter: add info_source to valid_atom
1067
+ A few atoms like %(objecttype) and %(objectsize) in the format
1068
+ specifier of "for-each-ref --format=<format>" can be filled without
1069
+ getting the full contents of the object, but just with the object
1070
+ header. These cases have been optimzied by calling
1071
+ oid_object_info() API.
1072
423
- Expecting a reroll, as it breaks compilation with uninitialized var.
424
- cf. https://travis-ci.org/git/git/jobs/402422102
1073
+ What's the doneness of this one?
1074
1075
1076
* pk/rebase-in-c (2018-07-09) 4 commits
@@ -430,240 +1079,77 @@ of the repositories listed at
1079
- rebase: refactor common shell functions into their own file
1080
- rebase: start implementing it as a builtin
1081
433
- Piecemeal rewrite of the "rebase" machinery in C.
1082
+ Piecemeal rewrite of the "rebase" machinery in C.
1083
1084
Expecting a reroll, but it seems that this is getting quite close.
1085
cf. <CAOZc8M8YmLwJOzG-1jyz8ft4W_tJMwNs6kSV8inX1q_zmDW8Sg@mail.gmail.com>
1086
1087
1088
* tb/config-default (2018-07-06) 1 commit
440
- - builtin/config: work around an unsized array forward declaration
441
-
442
- Compilation fix.
443
-
444
- Will merge to 'next'.
445
-
446
-
447
-* bp/log-ref-write-fd-with-strbuf (2018-07-10) 1 commit
448
- - convert log_ref_write_fd() to use strbuf
449
-
450
- Code clean-up.
451
-
452
- Will merge to 'next'.
453
-
454
-
455
-* hs/push-cert-check-cleanup (2018-07-11) 2 commits
456
- - gpg-interface: make parse_gpg_output static and remove from interface header
457
- - builtin/receive-pack: use check_signature from gpg-interface
458
-
459
- Code clean-up.
460
-
461
- Will merge to 'next'.
462
-
463
-
464
-* mk/merge-in-sparse-checkout (2018-07-11) 1 commit
465
- - unpack-trees: do not fail reset because of unmerged skipped entry
466
-
467
- "git reset --merge" (hence "git merge ---abort") and "git reset --hard"
468
- had trouble working correctly in a sparsely checked out working
469
- tree after a conflict, which has been corrected.
470
-
471
- Will merge to 'next'.
472
-
473
---------------------------------------------------
474
-[Stalled]
475
-
476
-* pw/add-p-select (2018-03-16) 3 commits
477
- - add -p: optimize line selection for short hunks
478
- - add -p: allow line selection to be inverted
479
- - add -p: select individual hunk lines
480
-
481
- "git add -p" interactive interface learned to let users choose
482
- individual added/removed lines to be used in the operation, instead
483
- of accepting or rejecting a whole hunk.
484
-
485
- Expecting a reroll to reignite the discussion.
486
- cf. <9895c7b7-eac4-28c1-90c6-443acd1131b7@talktalk.net>
487
-
488
-
489
-* jh/json-writer (2018-06-13) 1 commit
490
- - json_writer: new routines to create JSON data
491
-
492
- Preparatory code to later add json output for unspecified telemetry
493
- data.
494
-
495
- We do not add random code that does not have real users to our
496
- codebase, so let's have it wait until such a real code materializes
497
- before too long.
498
-
499
-
500
-* hn/bisect-first-parent (2018-04-21) 1 commit
501
- - bisect: create 'bisect_flags' parameter in find_bisection()
502
-
503
- Preliminary code update to allow passing more flags down the
504
- bisection codepath in the future.
505
-
506
- We do not add random code that does not have real users to our
507
- codebase, so let's have it wait until such a real code materializes
508
- before too long.
509
-
510
-
511
-* av/fsmonitor-updates (2018-01-04) 6 commits
512
- - fsmonitor: use fsmonitor data in `git diff`
513
- - fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
514
- - fsmonitor: make output of test-dump-fsmonitor more concise
515
- - fsmonitor: update helper tool, now that flags are filled later
516
- - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
517
- - dir.c: update comments to match argument name
518
-
519
- Code clean-up on fsmonitor integration, plus optional utilization
520
- of the fsmonitor data in diff-files.
521
-
522
- Waiting for an update.
523
- cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
524
-
525
-
526
-* pb/bisect-helper-2 (2018-06-13) 8 commits
527
- - t6030: make various test to pass GETTEXT_POISON tests
528
- - bisect--helper: `bisect_start` shell function partially in C
529
- - bisect--helper: `get_terms` & `bisect_terms` shell function in C
530
- - bisect--helper: `bisect_next_check` shell function in C
531
- - bisect--helper: `check_and_set_terms` shell function in C
532
- - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
533
- - bisect--helper: `bisect_write` shell function in C
534
- - bisect--helper: `bisect_reset` shell function in C
535
-
536
- Expecting a reroll.
537
- cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
538
-
539
- I just rebased the topic to a newer base as it did not build
540
- standalone with the base I originally queued the topic on, but
541
- otherwise there is no update to address any of the review comments
542
- in the thread above---we are still waiting for a reroll.
543
-
544
-
545
-* mk/http-backend-content-length (2018-06-11) 3 commits
546
- - http-backend: respect CONTENT_LENGTH for receive-pack
547
- - http-backend: respect CONTENT_LENGTH as specified by rfc3875
548
- - http-backend: cleanup writing to child process
549
-
550
- The http-backend (used for smart-http transport) used to slurp the
551
- whole input until EOF, without paying attention to CONTENT_LENGTH
552
- that is supplied in the environment and instead expecting the Web
553
- server to close the input stream. This has been fixed.
554
-
555
-
556
-* jk/drop-ancient-curl (2017-08-09) 5 commits
557
- - http: #error on too-old curl
558
- - curl: remove ifdef'd code never used with curl >=7.19.4
559
- - http: drop support for curl < 7.19.4
560
- - http: drop support for curl < 7.16.0
561
- - http: drop support for curl < 7.11.1
562
-
563
- Some code in http.c that has bitrot is being removed.
564
-
565
- Expecting a reroll.
566
-
567
-
568
-* mk/use-size-t-in-zlib (2017-08-10) 1 commit
569
- . zlib.c: use size_t for size
570
-
571
- The wrapper to call into zlib followed our long tradition to use
572
- "unsigned long" for sizes of regions in memory, which have been
573
- updated to use "size_t".
574
-
575
- Needs resurrecting by making sure the fix is good and still applies
576
- (or adjusted to today's codebase).
577
-
578
---------------------------------------------------
579
-[Cooking]
580
-
581
-* ao/config-from-gitmodules (2018-06-26) 6 commits
582
- (merged to 'next' on 2018-07-11 at 5d88dc6fb7)
583
- + submodule-config: reuse config_from_gitmodules in repo_read_gitmodules
584
- + submodule-config: pass repository as argument to config_from_gitmodules
585
- + submodule-config: make 'config_from_gitmodules' private
586
- + submodule-config: add helper to get 'update-clone' config from .gitmodules
587
- + submodule-config: add helper function to get 'fetch' config from .gitmodules
588
- + config: move config_from_gitmodules to submodule-config.c
589
-
590
- Tighten the API to make it harder to misuse in-tree .gitmodules
591
- file, even though it shares the same syntax with configuration
592
- files, to read random configuration items from it.
593
-
594
- Will merge to 'master'.
595
-
596
-
597
-* as/sequencer-customizable-comment-char (2018-06-28) 1 commit
598
- - sequencer: use configured comment character
599
-
600
- Honor core.commentchar when preparing the list of commits to replay
601
- in "rebase -i".
602
-
603
- Needs inter-contributor coordination.
604
- cf. <e8973797-fc5f-2ca5-1881-5ee66fc8279b@living180.net>
605
-
606
-
607
-* dj/runtime-prefix (2018-06-26) 1 commit
608
- (merged to 'next' on 2018-07-11 at 27d99fef94)
609
- + Makefile: tweak sed invocation
1089
+ (merged to 'next' on 2018-07-18 at 7994476f6f)
1090
+ + builtin/config: work around an unsized array forward declaration
1091
611
- POSIX portability fix in Makefile to fix a glitch introduced a few
612
- releases ago.
1092
+ Compilation fix.
1093
1094
Will merge to 'master'.
1095
1096
617
-* ds/commit-graph (2018-06-28) 1 commit
618
- (merged to 'next' on 2018-07-11 at d579f733ed)
619
- + commit-graph: fix documentation inconsistencies
1097
+* bp/log-ref-write-fd-with-strbuf (2018-07-10) 1 commit
1098
+ (merged to 'next' on 2018-07-18 at 25a3a99528)
1099
+ + convert log_ref_write_fd() to use strbuf
1100
621
- Docfix.
1101
+ Code clean-up.
1102
1103
Will merge to 'master'.
1104
1105
626
-* en/rebase-i-microfixes (2018-06-27) 3 commits
627
- (merged to 'next' on 2018-07-11 at d913ca0f77)
628
- + git-rebase--merge: modernize "git-$cmd" to "git $cmd"
629
- + Fix use of strategy options with interactive rebases
630
- + t3418: add testcase showing problems with rebase -i and strategy options
1106
+* hs/push-cert-check-cleanup (2018-07-11) 2 commits
1107
+ (merged to 'next' on 2018-07-18 at 1ed25fbd77)
1108
+ + gpg-interface: make parse_gpg_output static and remove from interface header
1109
+ + builtin/receive-pack: use check_signature from gpg-interface
1110
+ (this branch is used by hs/gpgsm.)
1111
+
1112
+ Code clean-up.
1113
1114
Will merge to 'master'.
1115
1116
635
-* js/enhanced-version-info (2018-06-29) 1 commit
636
- (merged to 'next' on 2018-07-11 at 815b2ea2bc)
637
- + Makefile: fix the "built from commit" code
1117
+* mk/merge-in-sparse-checkout (2018-07-11) 1 commit
1118
+ (merged to 'next' on 2018-07-18 at d2a6d2684d)
1119
+ + unpack-trees: do not fail reset because of unmerged skipped entry
1120
639
- Build fix.
1121
+ "git reset --merge" (hence "git merge ---abort") and "git reset --hard"
1122
+ had trouble working correctly in a sparsely checked out working
1123
+ tree after a conflict, which has been corrected.
1124
1125
Will merge to 'master'.
1126
1127
644
-* js/rebase-recreate-merge (2018-06-27) 1 commit
645
- (merged to 'next' on 2018-07-11 at eb8f33aaef)
646
- + rebase: fix documentation formatting
1128
+* as/sequencer-customizable-comment-char (2018-07-16) 1 commit
1129
+ (merged to 'next' on 2018-07-18 at 4163e23f29)
1130
+ + sequencer: use configured comment character
1131
648
- Docfix.
1132
+ Honor core.commentchar when preparing the list of commits to replay
1133
+ in "rebase -i".
1134
1135
Will merge to 'master'.
1136
1137
1138
* jt/connectivity-check-after-unshallow (2018-07-03) 1 commit
654
- - fetch-pack: write shallow, then check connectivity
655
- (this branch is used by jt/partial-clone-fsck-connectivity; uses bw/ref-in-want.)
1139
+ (merged to 'next' on 2018-07-18 at 8e7ee889c3)
1140
+ + fetch-pack: write shallow, then check connectivity
1141
+ (this branch is used by jt/partial-clone-fsck-connectivity and jt/tags-to-promised-blobs-fix; uses bw/ref-in-want.)
1142
1143
"git fetch" failed to correctly validate the set of objects it
1144
received when making a shallow history deeper, which has been
1145
corrected.
1146
661
- Will merge to 'next'.
1147
+ Will merge to 'master'.
1148
1149
1150
* jt/fetch-nego-tip (2018-07-03) 1 commit
1151
- fetch-pack: support negotiation tip whitelist
666
- (this branch uses jt/fetch-pack-negotiator.)
1152
+ (this branch uses jt/fetch-pack-negotiator; is tangled with jt/fetch-negotiator-skipping.)
1153
1154
"git fetch" learned a new option "--negotiation-tip" to limit the
1155
set of commits it tells the other end as "have", to reduce wasted
@@ -674,29 +1160,6 @@ of the repositories listed at
1160
Will merge to 'next'.
1161
1162
677
-* mb/filter-branch-optim (2018-06-26) 1 commit
678
- (merged to 'next' on 2018-07-11 at e43a0136c2)
679
- + filter-branch: skip commits present on --state-branch
680
-
681
- "git filter-branch" when used with the "--state-branch" option
682
- still attempted to rewrite the commits whose filtered result is
683
- known from the previous attempt (which is recorded on the state
684
- branch); the command has been corrected not to waste cycles doing
685
- so.
686
-
687
- Will merge to 'master'.
688
-
689
-
690
-* ms/core-icase-doc (2018-06-28) 1 commit
691
- (merged to 'next' on 2018-07-11 at 8f0d71c32d)
692
- + Documentation: declare "core.ignoreCase" as internal variable
693
-
694
- Clarify that setting core.ignoreCase to deviate from reality would
695
- not turn a case-incapable filesystem into a case-capable one.
696
-
697
- Will merge to 'master'.
698
-
699
-
1163
* rj/submodule-fsck-skip (2018-07-03) 1 commit
1164
(merged to 'next' on 2018-07-11 at 985f88cf7e)
1165
+ fsck: check skiplist for object in fsck_blob()
@@ -712,147 +1175,66 @@ of the repositories listed at
1175
* tb/grep-only-matching (2018-07-09) 2 commits
1176
- grep.c: teach 'git grep --only-matching'
1177
- grep.c: extract show_line_header()
715
- (this branch uses tb/grep-column.)
1178
1179
"git grep" learned the "--only-matching" option.
1180
1181
Will merge to 'next'.
1182
1183
722
-* tz/exclude-doc-smallfixes (2018-06-27) 2 commits
723
- (merged to 'next' on 2018-07-11 at 5134f1ca72)
724
- + dir.c: fix typos in core.excludesfile comment
725
- + gitignore.txt: clarify default core.excludesfile path
726
-
727
- Doc updates.
728
-
729
- Will merge to 'master'.
730
-
731
-
732
-* ld/p423 (2018-06-19) 6 commits
733
- (merged to 'next' on 2018-06-29 at af76acb664)
734
- + git-p4: python3: fix octal constants
735
- + git-p4: python3: use print() function
736
- + git-p4: python3: basestring workaround
737
- + git-p4: python3: remove backticks
738
- + git-p4: python3: replace dict.has_key(k) with "k in dict"
739
- + git-p4: python3: replace <> with !=
740
-
741
- Code preparation to make "git p4" closer to be usable with Python 3.
742
-
743
- Will merge to 'master'.
744
-
745
-
746
-* pw/rebase-i-keep-reword-after-conflict (2018-06-19) 1 commit
747
- (merged to 'next' on 2018-06-29 at 538337be74)
748
- + sequencer: do not squash 'reword' commits when we hit conflicts
749
-
750
- Bugfix for "rebase -i" corner case regression.
751
-
752
- Will merge to 'master'.
753
-
754
-
755
-* xy/format-patch-prereq-patch-id-fix (2018-06-19) 1 commit
756
- (merged to 'next' on 2018-06-29 at 0dffc46ce2)
757
- + format-patch: clear UNINTERESTING flag before prepare_bases
758
-
759
- Recently added "--base" option to "git format-patch" command did
760
- not correctly generate prereq patch ids.
761
-
762
- Will merge to 'master'.
763
-
764
-
765
-* bw/config-refer-to-gitsubmodules-doc (2018-06-21) 1 commit
766
- (merged to 'next' on 2018-06-29 at da6f49d292)
767
- + docs: link to gitsubmodules
768
-
769
- Docfix.
770
-
771
- Will merge to 'master'.
772
-
773
-
1184
* bw/ref-in-want (2018-06-28) 8 commits
775
- - fetch-pack: implement ref-in-want
776
- - fetch-pack: put shallow info in output parameter
777
- - fetch: refactor to make function args narrower
778
- - fetch: refactor fetch_refs into two functions
779
- - fetch: refactor the population of peer ref OIDs
780
- - upload-pack: test negotiation with changing repository
781
- - upload-pack: implement ref-in-want
782
- - test-pkt-line: add unpack-sideband subcommand
783
- (this branch is used by jt/connectivity-check-after-unshallow and jt/partial-clone-fsck-connectivity.)
1185
+ (merged to 'next' on 2018-07-18 at 7e9f8db37c)
1186
+ + fetch-pack: implement ref-in-want
1187
+ + fetch-pack: put shallow info in output parameter
1188
+ + fetch: refactor to make function args narrower
1189
+ + fetch: refactor fetch_refs into two functions
1190
+ + fetch: refactor the population of peer ref OIDs
1191
+ + upload-pack: test negotiation with changing repository
1192
+ + upload-pack: implement ref-in-want
1193
+ + test-pkt-line: add unpack-sideband subcommand
1194
+ (this branch is used by jt/connectivity-check-after-unshallow, jt/partial-clone-fsck-connectivity and jt/tags-to-promised-blobs-fix.)
1195
1196
Protocol v2 has been updated to allow slightly out-of-sync set of
1197
servers to work together to serve a single client, which would be
1198
useful with load-balanced servers that talk smart HTTP transport.
1199
789
- Will merge to 'next'.
1200
+ Will merge to 'master'.
1201
1202
1203
* en/rebase-consistency (2018-06-27) 9 commits
793
- - git-rebase: make --allow-empty-message the default
794
- - t3401: add directory rename testcases for rebase and am
795
- - git-rebase.txt: document behavioral differences between modes
796
- - directory-rename-detection.txt: technical docs on abilities and limitations
797
- - git-rebase.txt: address confusion between --no-ff vs --force-rebase
798
- - git-rebase: error out when incompatible options passed
799
- - t3422: new testcases for checking when incompatible options passed
800
- - git-rebase.sh: update help messages a bit
801
- - git-rebase.txt: document incompatible options
1204
+ (merged to 'next' on 2018-07-18 at d597206c79)
1205
+ + git-rebase: make --allow-empty-message the default
1206
+ + t3401: add directory rename testcases for rebase and am
1207
+ + git-rebase.txt: document behavioral differences between modes
1208
+ + directory-rename-detection.txt: technical docs on abilities and limitations
1209
+ + git-rebase.txt: address confusion between --no-ff vs --force-rebase
1210
+ + git-rebase: error out when incompatible options passed
1211
+ + t3422: new testcases for checking when incompatible options passed
1212
+ + git-rebase.sh: update help messages a bit
1213
+ + git-rebase.txt: document incompatible options
1214
1215
"git rebase" behaved slightly differently depending on which one of
1216
the three backends gets used; this has been documented and an
1217
effort to make them more uniform has begun.
1218
807
- Will merge to 'next'.
808
-
809
-
810
-* jt/remove-pack-bitmap-global (2018-06-21) 2 commits
811
- (merged to 'next' on 2018-06-29 at 852857b04e)
812
- + pack-bitmap: add free function
813
- + pack-bitmap: remove bitmap_git global variable
814
-
815
- The effort to move globals to per-repository in-core structure
816
- continues.
817
-
1219
Will merge to 'master'.
1220
1221
1222
* sb/submodule-move-head-error-msg (2018-06-25) 1 commit
822
- - submodule.c: report the submodule that an error occurs in
823
-
824
- Will merge to 'next'.
825
-
826
-
827
-* bw/protocol-v2 (2018-06-22) 1 commit
828
- (merged to 'next' on 2018-06-29 at 78090cc343)
829
- + protocol-v2 doc: put HTTP headers after request
830
-
831
- Doc fix.
1223
+ (merged to 'next' on 2018-07-18 at 9e213ad1aa)
1224
+ + submodule.c: report the submodule that an error occurs in
1225
1226
Will merge to 'master'.
1227
1228
1229
* jk/branch-l-1-repurpose (2018-06-22) 1 commit
1230
- branch: make "-l" a synonym for "--list"
838
- (this branch uses jk/branch-l-0-deprecation.)
1231
1232
Updated plan to repurpose the "-l" option to "git branch".
1233
1234
Will hold in 'pu' until jk/branch-l-0-deprecation progresses sufficiently.
1235
1236
845
-* vs/typofixes (2018-06-22) 1 commit
846
- (merged to 'next' on 2018-06-29 at 665c8db2f7)
847
- + Documentation: spelling and grammar fixes
848
-
849
- Doc fix.
850
-
851
- Will merge to 'master'.
852
-
853
-
854
-* cc/remote-odb (2018-07-06) 10 commits
855
- - SQUASH??? error: unused variable 'o' [-Werror=unused-variable]
1237
+* cc/remote-odb (2018-07-16) 9 commits
1238
- Documentation/config: add odb.<name>.promisorRemote
1239
- t0410: test fetching from many promisor remotes
1240
- Use odb.origin.partialclonefilter instead of core.partialclonefilter
@@ -863,59 +1245,42 @@ of the repositories listed at
1245
- Add initial remote odb support
1246
- fetch-object: make functions return an error code
1247
866
- Needs a reroll.
867
-
868
-
869
-* ds/multi-pack-index (2018-07-09) 24 commits
870
- . midx: clear midx on repack
871
- . packfile: skip loading index if in multi-pack-index
872
- . midx: prevent duplicate packfile loads
873
- . midx: use midx in approximate_object_count
874
- . midx: use existing midx when writing new one
875
- . midx: use midx in abbreviation calculations
876
- . midx: read objects from multi-pack-index
877
- . midx: prepare midxed_git struct
878
- . config: create core.multiPackIndex setting
879
- . midx: write object offsets
880
- . midx: write object id fanout chunk
881
- . midx: write object ids in a chunk
882
- . midx: sort and deduplicate objects from packfiles
883
- . midx: read pack names into array
884
- . multi-pack-index: write pack names in chunk
885
- . multi-pack-index: read packfile list
886
- . packfile: generalize pack directory list
887
- . multi-pack-index: expand test data
888
- . multi-pack-index: load into memory
889
- . midx: write header information to lockfile
890
- . multi-pack-index: add 'write' verb
891
- . multi-pack-index: add builtin
892
- . multi-pack-index: add format details
893
- . multi-pack-index: add design document
1248
+
1249
+* ds/multi-pack-index (2018-07-12) 23 commits
1250
+ - midx: clear midx on repack
1251
+ - packfile: skip loading index if in multi-pack-index
1252
+ - midx: prevent duplicate packfile loads
1253
+ - midx: use midx in approximate_object_count
1254
+ - midx: use existing midx when writing new one
1255
+ - midx: use midx in abbreviation calculations
1256
+ - midx: read objects from multi-pack-index
1257
+ - config: create core.multiPackIndex setting
1258
+ - midx: write object offsets
1259
+ - midx: write object id fanout chunk
1260
+ - midx: write object ids in a chunk
1261
+ - midx: sort and deduplicate objects from packfiles
1262
+ - midx: read pack names into array
1263
+ - multi-pack-index: write pack names in chunk
1264
+ - multi-pack-index: read packfile list
1265
+ - packfile: generalize pack directory list
1266
+ - t5319: expand test data
1267
+ - multi-pack-index: load into memory
1268
+ - midx: write header information to lockfile
1269
+ - multi-pack-index: add 'write' verb
1270
+ - multi-pack-index: add builtin
1271
+ - multi-pack-index: add format details
1272
+ - multi-pack-index: add design document
1273
1274
When there are too many packfiles in a repository (which is not
1275
recommended), looking up an object in these would require
1276
consulting many pack .idx files; a new mechanism to have a single
1277
file that consolidates all of these .idx files is introduced.
1278
900
- Expecting a reroll to fix documentation build.
901
- cf. https://travis-ci.org/git/git/jobs/402422110
902
-
903
-
904
-* tb/grep-column (2018-06-22) 7 commits
905
- (merged to 'next' on 2018-06-29 at 25dc70426e)
906
- + contrib/git-jump/git-jump: jump to exact location
907
- + grep.c: add configuration variables to show matched option
908
- + builtin/grep.c: add '--column' option to 'git-grep(1)'
909
- + grep.c: display column number of first match
910
- + grep.[ch]: extend grep_opt to allow showing matched column
911
- + grep.c: expose {,inverted} match column in match_line()
912
- + Documentation/config.txt: camel-case lineNumber for consistency
913
- (this branch is used by tb/grep-only-matching.)
914
-
915
- "git grep" learned the "--column" option that gives not just the
916
- line number but the column number of the hit.
917
-
918
- Will merge to 'master'.
1279
+ What's the doneness of this one? I vaguely recall that there was
1280
+ an objection against the concept as a whole (i.e. there is a way
1281
+ with less damage to gain the same object-abbrev performance); has
1282
+ it (and if anything else, they) been resolved in satisfactory
1283
+ fashion?
1284
1285
1286
* jt/fetch-pack-negotiator (2018-06-15) 7 commits
@@ -926,7 +1291,7 @@ of the repositories listed at
1291
- fetch-pack: directly end negotiation if ACK ready
1292
- fetch-pack: clear marks before re-marking
1293
- fetch-pack: split up everything_local()
929
- (this branch is used by jt/fetch-nego-tip.)
1294
+ (this branch is used by jt/fetch-nego-tip and jt/fetch-negotiator-skipping.)
1295
1296
Code restructuring and a small fix to transport protocol v2 during
1297
fetching.
@@ -934,43 +1299,6 @@ of the repositories listed at
1299
Will merge to 'next'.
1300
1301
937
-* sb/submodule-core-worktree (2018-06-19) 3 commits
938
- (merged to 'next' on 2018-06-28 at 96e1a8dbd1)
939
- + submodule deinit: unset core.worktree
940
- + submodule: ensure core.worktree is set after update
941
- + submodule: unset core.worktree if no working tree is present
942
-
943
- Originally merged to 'next' on 2018-06-22
944
-
945
- "git submodule" did not correctly adjust core.worktree setting that
946
- indicates whether/where a submodule repository has its associated
947
- working tree across various state transitions, which has been
948
- corrected.
949
-
950
- Will merge to 'master'.
951
-
952
-
953
-* ds/ewah-cleanup (2018-06-21) 10 commits
954
- (merged to 'next' on 2018-06-28 at 9cd7c0d54a)
955
- + ewah: delete unused 'rlwit_discharge_empty()'
956
- + ewah: drop ewah_serialize_native function
957
- + ewah: drop ewah_deserialize function
958
- + ewah_io: delete unused 'ewah_serialize()'
959
- + ewah_bitmap: delete unused 'ewah_or()'
960
- + ewah_bitmap: delete unused 'ewah_not()'
961
- + ewah_bitmap: delete unused 'ewah_and_not()'
962
- + ewah_bitmap: delete unused 'ewah_and()'
963
- + ewah/bitmap.c: delete unused 'bitmap_each_bit()'
964
- + ewah/bitmap.c: delete unused 'bitmap_clear()'
965
-
966
- Originally merged to 'next' on 2018-06-22
967
-
968
- Remove unused function definitions and declarations from ewah
969
- bitmap subsystem.
970
-
971
- Will merge to 'master'.
972
-
973
-
1302
* is/parsing-line-range (2018-06-15) 2 commits
1303
- log: prevent error if line range ends past end of file
1304
- blame: prevent error if range ends past end of file
@@ -981,22 +1309,6 @@ of the repositories listed at
1309
Will merge to 'next'.
1310
1311
984
-* en/merge-recursive-cleanup (2018-06-12) 6 commits
985
- (merged to 'next' on 2018-06-28 at 1a3646eb7d)
986
- + merge-recursive: add pointer about unduly complex looking code
987
- + merge-recursive: rename conflict_rename_*() family of functions
988
- + merge-recursive: clarify the rename_dir/RENAME_DIR meaning
989
- + merge-recursive: align labels with their respective code blocks
990
- + merge-recursive: fix numerous argument alignment issues
991
- + merge-recursive: fix miscellaneous grammar error in comment
992
-
993
- Originally merged to 'next' on 2018-06-19
994
-
995
- Code cleanup.
996
-
997
- Will merge to 'master'.
998
-
999
-
1312
* ab/checkout-default-remote (2018-06-11) 8 commits
1313
- checkout & worktree: introduce checkout.defaultRemote
1314
- checkout: add advice for ambiguous "checkout <branch>"
@@ -1015,7 +1327,8 @@ of the repositories listed at
1327
Will merge to 'next'.
1328
1329
1018
-* ds/commit-graph-fsck (2018-06-27) 22 commits
1330
+* ds/commit-graph-fsck (2018-07-16) 23 commits
1331
+ - coccinelle: update commit.cocci
1332
- commit-graph: update design document
1333
- gc: automatically write commit-graph files
1334
- commit-graph: add '--reachable' option
@@ -1077,38 +1390,7 @@ of the repositories listed at
1390
a bit sad, though.
1391
1392
1080
-* sb/object-store-grafts (2018-05-18) 19 commits
1081
- (merged to 'next' on 2018-06-28 at 02f70d6302)
1082
- + commit: allow lookup_commit_graft to handle arbitrary repositories
1083
- + commit: allow prepare_commit_graft to handle arbitrary repositories
1084
- + shallow: migrate shallow information into the object parser
1085
- + path.c: migrate global git_path_* to take a repository argument
1086
- + cache: convert get_graft_file to handle arbitrary repositories
1087
- + commit: convert read_graft_file to handle arbitrary repositories
1088
- + commit: convert register_commit_graft to handle arbitrary repositories
1089
- + commit: convert commit_graft_pos() to handle arbitrary repositories
1090
- + shallow: add repository argument to is_repository_shallow
1091
- + shallow: add repository argument to check_shallow_file_for_update
1092
- + shallow: add repository argument to register_shallow
1093
- + shallow: add repository argument to set_alternate_shallow_file
1094
- + commit: add repository argument to lookup_commit_graft
1095
- + commit: add repository argument to prepare_commit_graft
1096
- + commit: add repository argument to read_graft_file
1097
- + commit: add repository argument to register_commit_graft
1098
- + commit: add repository argument to commit_graft_pos
1099
- + object: move grafts to object parser
1100
- + object-store: move object access functions to object-store.h
1101
- (this branch is used by sb/object-store-lookup.)
1102
-
1103
- Originally merged to 'next' on 2018-06-22
1104
-
1105
- The conversion to pass "the_repository" and then "a_repository"
1106
- throughout the object access API continues.
1107
-
1108
- Will merge to 'master'.
1109
-
1110
-
1111
-* sb/diff-color-move-more (2018-06-29) 9 commits
1393
+* sb/diff-color-move-more (2018-07-17) 9 commits
1394
- diff.c: add white space mode to move detection that allows indent changes
1395
- diff.c: factor advance_or_nullify out of mark_color_as_moved
1396
- diff.c: decouple white space treatment from move detection algorithm
@@ -1123,22 +1405,6 @@ of the repositories listed at
1405
1406
Will merge to 'next'.
1407
1126
-
1127
-* jk/branch-l-0-deprecation (2018-06-22) 3 commits
1128
- (merged to 'next' on 2018-06-29 at fac676dfb9)
1129
- + branch: deprecate "-l" option
1130
- + t: switch "branch -l" to "branch --create-reflog"
1131
- + t3200: unset core.logallrefupdates when testing reflog creation
1132
- (this branch is used by jk/branch-l-1-repurpose.)
1133
-
1134
- The "-l" option in "git branch -l" is an unfortunate short-hand for
1135
- "--create-reflog", but many users, both old and new, somehow expect
1136
- it to be something else, perhaps "--list". This step warns when "-l"
1137
- is used as a short-hand for "--create-reflog" and warns about the
1138
- future repurposing of the it when it is used.
1139
-
1140
- Will merge to 'master'.
1141
-
1408
--------------------------------------------------
1409
[Discarded]
1410