What's cooking (2017/11) #08
Junio C Hamano committed
Nov 28, 2017 at 14:23 UTC
bf19a7380947d8e9b3b5b623135b95e16d187f83
1 file changed
+498
-465
whats-cooking.txt
+498
-465
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Nov 2017, #07; Fri, 24)
4
-X-master-at: 14c63a9dc093d6738454f6369a4f5663ca732cf7
5
-X-next-at: b06021eebab0504f6c8e11598ad9be6115ba037d
3
+Subject: What's cooking in git.git (Nov 2017, #08; Tue, 28)
4
+X-master-at: 1a4e40aa5dc16564af879142ba9dfbbb88d1e5ff
5
+X-next-at: 9478a6608122bc94547963754b0a9f2821bb2cfb
6
7
-What's cooking in git.git (Nov 2017, #07; Fri, 24)
7
+What's cooking in git.git (Nov 2017, #08; Tue, 28)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,18 +12,384 @@ 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
-Quite a few "fixes" have been accumulated on 'master' and already
16
-merged to 'maint' in preparation for 2.15.1; perhaps we can tag it
17
-near the end of the month--no fix in the mix is an ultra urgent one.
15
+Git 2.15.1 has been tagged, with many of the fixes that have already
16
+been in 'master'.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
20
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
+--------------------------------------------------
24
+[Graduated to "master"]
25
+
26
+* ew/rebase-mboxrd (2017-11-18) 1 commit
27
+ (merged to 'next' on 2017-11-21 at 88eaaac334)
28
+ + rebase: use mboxrd format to avoid split errors
29
+
30
+ When "git rebase" prepared an mailbox of changes and fed it to "git
31
+ am" to replay them, it was confused when a stray "From " happened
32
+ to be in the log message of one of the replayed changes. This has
33
+ been corrected.
34
+
35
+
36
+* jc/branch-name-sanity (2017-11-15) 4 commits
37
+ (merged to 'next' on 2017-11-20 at 7236b0dde3)
38
+ + builtin/branch: remove redundant check for HEAD
39
+ + branch: correctly reject refs/heads/{-dash,HEAD}
40
+ + branch: split validate_new_branchname() into two
41
+ + branch: streamline "attr_only" handling in validate_new_branchname()
42
+
43
+ "git branch" and "git checkout -b" are now forbidden from creating
44
+ a branch whose name is "HEAD".
45
+
46
+
47
+* jc/ignore-cr-at-eol (2017-11-08) 2 commits
48
+ (merged to 'next' on 2017-11-20 at 9f7bae7cbd)
49
+ + diff: --ignore-cr-at-eol
50
+ + xdiff: reassign xpparm_t.flags bits
51
+
52
+ The "diff" family of commands learned to ignore differences in
53
+ carriage return at the end of line.
54
+
55
+
56
+* jc/merge-base-fork-point-doc (2017-11-09) 1 commit
57
+ (merged to 'next' on 2017-11-20 at 199b9255b4)
58
+ + merge-base --fork-point doc: clarify the example and failure modes
59
+
60
+ Clarify and enhance documentation for "merge-base --fork-point", as
61
+ it was clear what it computed but not why/what for.
62
+
63
+
64
+* ks/rebase-no-git-foo (2017-11-21) 1 commit
65
+ (merged to 'next' on 2017-11-22 at 336552dbb7)
66
+ + git-rebase: clean up dashed-usages in messages
67
+
68
+ Mentions of "git-rebase" and "git-am" (dashed form) still remained
69
+ in end-user visible strings emitted by the "git rebase" command;
70
+ they have been corrected.
71
+
72
+
73
+* ma/branch-list-paginate (2017-11-20) 3 commits
74
+ (merged to 'next' on 2017-11-22 at eecd7f2369)
75
+ + branch: change default of `pager.branch` to "on"
76
+ + branch: respect `pager.branch` in list-mode only
77
+ + t7006: add tests for how git branch paginates
78
+
79
+ "git branch --list" learned to show its output through the pager by
80
+ default when the output is going to a terminal, which is controlled
81
+ by the pager.branch configuration variable. This is similar to a
82
+ recent change to "git tag --list".
83
+
84
+
85
+* pw/sequencer-recover-from-unlockable-index (2017-11-16) 1 commit
86
+ (merged to 'next' on 2017-11-20 at 36f0ed26ce)
87
+ + sequencer: reschedule pick if index can't be locked
88
+
89
+ The sequencer machinery (used by "git cherry-pick A..B", and "git
90
+ rebase -i", among other things) would have lost a commit if stopped
91
+ due to an unlockable index file, which has been fixed.
92
+
93
+
94
+* rs/apply-inaccurate-eof-with-incomplete-line (2017-11-17) 1 commit
95
+ (merged to 'next' on 2017-11-20 at c8aee1d135)
96
+ + apply: update line lengths for --inaccurate-eof
97
+
98
+ "git apply --inaccurate-eof" when used with "--ignore-space-change"
99
+ triggered an internal sanity check, which has been fixed.
100
+
101
+
102
+* rs/config-write-section-fix (2017-11-18) 1 commit
103
+ (merged to 'next' on 2017-11-21 at a7f3f93e0c)
104
+ + config: flip return value of write_section()
105
+
106
+ There was a recent semantic mismerge in the codepath to write out a
107
+ section of a configuration section, which has been corrected.
108
+
109
+
110
+* rs/include-comments-before-the-function-header (2017-11-21) 6 commits
111
+ (merged to 'next' on 2017-11-22 at d7255a836f)
112
+ + grep: show non-empty lines before functions with -W
113
+ + grep: update boundary variable for pre-context
114
+ + t7810: improve check of -W with user-defined function lines
115
+ + xdiff: show non-empty lines before functions with -W
116
+ + xdiff: factor out is_func_rec()
117
+ + t4051: add test for comments preceding function lines
118
+
119
+ "git grep -W", "git diff -W" and their friends learned a heuristic
120
+ to extend a pre-context beyond the line that matches the "function
121
+ pattern" (aka "diff.*.xfuncname") to include a comment block, if
122
+ exists, that immediately precedes it.
123
+
124
+
125
+* rv/sendemail-tocmd-in-config-and-completion (2017-11-14) 2 commits
126
+ (merged to 'next' on 2017-11-20 at 75cf6e2fc3)
127
+ + completion: add git config sendemail.tocmd
128
+ + Documentation/config: add sendemail.tocmd to list preceding "See git-send-email(1)"
129
+
130
+ Teach "sendemail.tocmd" to places that know about "sendemail.to",
131
+ like documentation and shell completion (in contrib/).
132
+
133
+
134
+* sb/test-cherry-pick-submodule-getting-in-a-way (2017-11-15) 2 commits
135
+ (merged to 'next' on 2017-11-20 at fe7016689e)
136
+ + merge-recursive: handle addition of submodule on our side of history
137
+ + t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
138
+
139
+ The three-way merge performed by "git cherry-pick" was confused
140
+ when a new submodule was added in the meantime, which has been
141
+ fixed (or "papered over").
142
+
143
+
144
+* sd/branch-copy (2017-11-16) 1 commit
145
+ (merged to 'next' on 2017-11-20 at e33bcc460a)
146
+ + config: avoid "write_in_full(fd, buf, len) != len" pattern
147
+
148
+ Code clean-up.
149
+
150
+
151
+* sw/pull-ipv46-passthru (2017-11-21) 1 commit
152
+ (merged to 'next' on 2017-11-22 at b06021eeba)
153
+ + pull: pass -4/-6 option to 'git fetch'
154
+
155
+ Contrary to the documentation, "git pull -4/-6 other-args" did not
156
+ ask the underlying "git fetch" to go over IPv4/IPv6, which has been
157
+ corrected.
158
+
159
+
160
+* tb/add-renormalize (2017-11-17) 1 commit
161
+ (merged to 'next' on 2017-11-20 at e302f3591f)
162
+ + add: introduce "--renormalize"
163
+
164
+ "git add --renormalize ." is a new and safer way to record the fact
165
+ that you are correcting the end-of-line convention and other
166
+ "convert_to_git()" glitches in the in-repository data.
167
+
168
+
169
+* tz/complete-branch-copy (2017-11-17) 1 commit
170
+ (merged to 'next' on 2017-11-20 at 6d22384fcd)
171
+ + completion: add '--copy' option to 'git branch'
172
+
173
+ Command line completion (in contrib/) has been taught about the
174
+ "--copy" option of "git branch".
175
+
176
+
177
+* tz/notes-error-to-stderr (2017-11-15) 1 commit
178
+ (merged to 'next' on 2017-11-20 at a45d441ee2)
179
+ + notes: send "Automatic notes merge failed" messages to stderr
180
+
181
+ "git notes" sent its error message to its standard output stream,
182
+ which was corrected.
183
+
184
+
185
+* tz/redirect-fix (2017-11-14) 2 commits
186
+ (merged to 'next' on 2017-11-20 at 5b13f7026e)
187
+ + rebase: fix stderr redirect in apply_autostash()
188
+ + t/lib-gpg: fix gpgconf stderr redirect to /dev/null
189
+
190
+ A few scripts (both in production and tests) incorrectly redirected
191
+ their error output. These have been corrected.
192
+
193
--------------------------------------------------
194
[New Topics]
195
196
+* en/merge-recursive-icase-removal (2017-11-27) 1 commit
197
+ - merge-recursive: ignore_case shouldn't reject intentional removals
198
+
199
+ The code internal to the recursive merge strategy was not fully
200
+ prepared to see a path that is renamed to try overwriting another
201
+ path that is only different in case on case insensitive systems.
202
+ This does not matter in the current code, but will start to matter
203
+ once the rename detection logic starts taking hints from nearby
204
+ paths moving to some directory and moves a new path along with them.
205
+
206
+
207
+* gk/tracing-optimization (2017-11-27) 3 commits
208
+ - SQUASH??? compilation fix-up
209
+ - trace: improve performance while category is disabled
210
+ - trace: remove trace key normalization
211
+
212
+ The tracing infrastructure has been optimized for cases where no
213
+ tracing is requested.
214
+
215
+
216
+* pc/submodule-helper (2017-11-26) 1 commit
217
+ - submodule--helper.c: i18n: add a missing space in message
218
+
219
+ A message fix.
220
+
221
+ Will merge to 'next'.
222
+
223
+
224
+* tb/check-crlf-for-safe-crlf (2017-11-27) 1 commit
225
+ - convert: tighten the safe autocrlf handling
226
+
227
+ The "safe crlf" check incorrectly triggered for contents that does
228
+ not use CRLF as line endings, which has been corrected.
229
+
230
+ Will merge to 'next'.
231
+
232
+
233
+* tg/t-readme-updates (2017-11-27) 2 commits
234
+ - t/README: document test_cmp_rev
235
+ - t/README: remove mention of adding copyright notices
236
+
237
+ Developer doc updates.
238
+
239
+ Will merge to 'next'.
240
+
241
+
242
+* cc/require-tcl-tk-for-build (2017-11-27) 1 commit
243
+ - Makefile: check that tcl/tk is installed
244
+
245
+ A first-time builder of Git may have installed neither tclsh nor
246
+ msgfmt, in which case git-gui and gitk part will fail and break the
247
+ build. As a workaround, refuse to run a build when tclsh is not
248
+ installed and NO_TCLTK is not set.
249
+
250
+ Undecided.
251
+ I still feel that requring tclsh to be installed, with or without
252
+ "escape hatch" for experts, may be too heavy-handed.
253
+
254
+
255
+* mk/http-backend-content-length (2017-11-27) 4 commits
256
+ - SQUASH???
257
+ - t5560-http-backend-noserver.sh: add CONTENT_LENGTH cases
258
+ - SQUASH???
259
+ - http-backend: respect CONTENT_LENGTH as specified by rfc3875
260
+
261
+ The http-backend (used for smart-http transport) used to slurp the
262
+ whole input until EOF, without paying attention to CONTENT_LENGTH
263
+ that is supplied in the environment and instead expecting the Web
264
+ server to close the input stream. This has been fixed.
265
+
266
+ Expecting a reroll.
267
+ Suggested fixes to be used when rerolling is queued, but I'd
268
+ prefer _not_ squashing them myself.
269
+
270
+
271
+* fk/sendmail-from-path (2017-11-28) 1 commit
272
+ - git-send-email: honor $PATH for sendmail binary
273
+
274
+ "git send-email" tries to see if the sendmail program is available
275
+ in /usr/lib and /usr/sbin; extend the list of locations to be
276
+ checked to also include directories on $PATH.
277
+
278
+ Will merge to 'next'.
279
+
280
+
281
+* jk/no-optional-locks (2017-11-27) 1 commit
282
+ - git-status.txt: mention --no-optional-locks
283
+
284
+ Doc update for a feature available in Git v2.14 and upwards.
285
+
286
+
287
+* jt/diff-anchored-patience (2017-11-28) 1 commit
288
+ - diff: support anchoring line(s)
289
+
290
+ "git diff" learned a variant of the "--patience" algorithm, to
291
+ which the user can specify which 'unique' line to be used as
292
+ anchoring points.
293
+
294
+
295
+* ks/doc-checkout-previous (2017-11-28) 1 commit
296
+ - Doc/checkout: checking out using @{-N} can lead to detached state
297
+
298
+ @{-N} in "git checkout @{-N}" may refer to a detached HEAD state,
299
+ but the documentation was not clear about it, which has been fixed.
300
+
301
+ Will merge to 'next'.
302
+
303
+--------------------------------------------------
304
+[Stalled]
305
+
306
+* jc/merge-symlink-ours-theirs (2017-09-26) 1 commit
307
+ - merge: teach -Xours/-Xtheirs to symbolic link merge
308
+
309
+ "git merge -Xours/-Xtheirs" learned to use our/their version when
310
+ resolving a conflicting updates to a symbolic link.
311
+
312
+ Needs review.
313
+
314
+
315
+* mg/merge-base-fork-point (2017-09-17) 3 commits
316
+ - merge-base: find fork-point outside partial reflog
317
+ - merge-base: return fork-point outside reflog
318
+ - t6010: test actual test output
319
+
320
+ "merge-base --fork-point $branch $commit" is used to guess on which
321
+ commit among the commits that were once at the tip of the $branch the
322
+ $commit was built on top of, and it learns these historical tips from
323
+ the reflog of the $branch. When the true fork-point is lost due to
324
+ pruning of old reflog entries, the command does not give any output,
325
+ because it has no way to guess correctly and does not want to mislead
326
+ the user with a wrong guess.
327
+
328
+ The command has been updated to give the best but not known to be
329
+ correct guess, based on a hope that a merge-base between $commit and a
330
+ virtual merge across all the reflog entries that still are available
331
+ for $branch may still be a closer to the true fork-point than the
332
+ merge-base between $commit and the current tip of the $branch.
333
+
334
+ This may have to be offered by an additional option, to allow the
335
+ users that are prepared to see a potentially incorrect guess to opt
336
+ into the feature, without affecting the current callers that may not
337
+ be prepared to accept a guess that is not known to be correct.
338
+
339
+ What's the doneness of this one?
340
+
341
+
342
+* jk/drop-ancient-curl (2017-08-09) 5 commits
343
+ - http: #error on too-old curl
344
+ - curl: remove ifdef'd code never used with curl >=7.19.4
345
+ - http: drop support for curl < 7.19.4
346
+ - http: drop support for curl < 7.16.0
347
+ - http: drop support for curl < 7.11.1
348
+
349
+ Some code in http.c that has bitrot is being removed.
350
+
351
+ Expecting a reroll.
352
+
353
+
354
+* mk/use-size-t-in-zlib (2017-08-10) 1 commit
355
+ . zlib.c: use size_t for size
356
+
357
+ The wrapper to call into zlib followed our long tradition to use
358
+ "unsigned long" for sizes of regions in memory, which have been
359
+ updated to use "size_t".
360
+
361
+ Needs resurrecting by making sure the fix is good and still applies
362
+ (or adjusted to today's codebase).
363
+
364
+
365
+* mg/status-in-progress-info (2017-05-10) 2 commits
366
+ - status --short --inprogress: spell it as --in-progress
367
+ - status: show in-progress info for short status
368
+
369
+ "git status" learns an option to report various operations
370
+ (e.g. "merging") that the user is in the middle of.
371
+
372
+ cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
373
+
374
+
375
+* nd/worktree-move (2017-04-20) 6 commits
376
+ - worktree remove: new command
377
+ - worktree move: refuse to move worktrees with submodules
378
+ - worktree move: accept destination as directory
379
+ - worktree move: new command
380
+ - worktree.c: add update_worktree_location()
381
+ - worktree.c: add validate_worktree()
382
+
383
+ "git worktree" learned move and remove subcommands.
384
+
385
+ Expecting a reroll.
386
+ cf. <20170420101024.7593-1-pclouds@gmail.com>
387
+ cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
388
+ cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
389
+
390
+--------------------------------------------------
391
+[Cooking]
392
+
393
* en/rename-directory-detection (2017-11-21) 33 commits
394
- merge-recursive: ensure we write updates for directory-renamed file
395
- merge-recursive: avoid spurious rename/rename conflict from dir renames
@@ -69,65 +435,72 @@ of the repositories listed at
435
436
437
* ac/complete-pull-autostash (2017-11-22) 1 commit
72
- - completion: add --autostash and --no-autostash to pull
438
+ (merged to 'next' on 2017-11-27 at 802d204eda)
439
+ + completion: add --autostash and --no-autostash to pull
440
441
The shell completion (in contrib/) learned that "git pull" can take
442
the "--autostash" option.
443
77
- Will merge to 'next'.
444
+ Will merge to 'master'.
445
446
447
* cc/git-packet-pm (2017-11-22) 2 commits
81
- - Git/Packet.pm: use 'if' instead of 'unless'
82
- - Git/Packet: clarify that packet_required_key_val_read allows EOF
448
+ (merged to 'next' on 2017-11-27 at 1527ab3519)
449
+ + Git/Packet.pm: use 'if' instead of 'unless'
450
+ + Git/Packet: clarify that packet_required_key_val_read allows EOF
451
452
Code clean-up.
453
86
- Will merge to 'next'.
454
+ Will merge to 'master'.
455
456
457
* jn/reproducible-build (2017-11-22) 3 commits
90
- - Merge branch 'jn/reproducible-build' of ../git-gui into jn/reproducible-build
91
- - git-gui: sort entries in optimized tclIndex
92
- - generate-cmdlist: avoid non-deterministic output
458
+ (merged to 'next' on 2017-11-27 at 6ae6946f8c)
459
+ + Merge branch 'jn/reproducible-build' of ../git-gui into jn/reproducible-build
460
+ + git-gui: sort entries in optimized tclIndex
461
+ + generate-cmdlist: avoid non-deterministic output
462
463
The build procedure has been taught to avoid some unnecessary
464
instability in the build products.
465
97
- Will merge to 'next'.
466
+ Will merge to 'master'.
467
468
469
* jt/submodule-tests-cleanup (2017-11-22) 1 commit
101
- - Tests: clean up submodule recursive helpers
470
+ (merged to 'next' on 2017-11-27 at 5f0e4bcde1)
471
+ + Tests: clean up submodule recursive helpers
472
473
Further test clean-up.
474
105
- Will merge to 'next'.
475
+ Will merge to 'master'.
476
477
478
* rd/man-prune-progress (2017-11-22) 1 commit
109
- - prune: add "--progress" to man page and usage msg
479
+ (merged to 'next' on 2017-11-27 at 1680e6a2f5)
480
+ + prune: add "--progress" to man page and usage msg
481
482
Doc update.
483
113
- Will merge to 'next'.
484
+ Will merge to 'master'.
485
486
487
* rd/man-reflog-add-n (2017-11-22) 1 commit
117
- - doc: add missing "-n" (dry-run) option to reflog man page
488
+ (merged to 'next' on 2017-11-27 at eacb065aa6)
489
+ + doc: add missing "-n" (dry-run) option to reflog man page
490
491
Doc update.
492
121
- Will merge to 'next'.
493
+ Will merge to 'master'.
494
495
496
* ph/stash-save-m-option-fix (2017-11-24) 1 commit
125
- - stash: learn to parse -m/--message like commit does
497
+ (merged to 'next' on 2017-11-27 at 96eadf9372)
498
+ + stash: learn to parse -m/--message like commit does
499
500
In addition to "git stash -m message", the command learned to
501
accept "git stash -mmessage" form.
502
130
- Will merge to 'next'.
503
+ Will merge to 'master'.
504
505
506
* ra/decorate-limit-refs (2017-11-22) 1 commit
@@ -141,19 +514,21 @@ of the repositories listed at
514
515
516
* rd/doc-notes-prune-fix (2017-11-22) 1 commit
144
- - notes: correct 'git notes prune' options to '[-n] [-v]'
517
+ (merged to 'next' on 2017-11-27 at 4a657474ee)
518
+ + notes: correct 'git notes prune' options to '[-n] [-v]'
519
520
Doc update.
521
148
- Will merge to 'next'.
522
+ Will merge to 'master'.
523
524
525
* tg/deprecate-stash-save (2017-11-22) 1 commit
152
- - doc: prefer 'stash push' over 'stash save'
526
+ (merged to 'next' on 2017-11-27 at 6bcb61b267)
527
+ + doc: prefer 'stash push' over 'stash save'
528
529
Doc update.
530
156
- Will merge to 'next'.
531
+ Will merge to 'master'.
532
533
534
* ab/pcre2-grep (2017-11-24) 2 commits
@@ -175,136 +550,49 @@ of the repositories listed at
550
551
552
* sb/diff-blobfind (2017-11-24) 1 commit
178
- - diff: add a new diffcore transformation to find a specific blob
179
-
180
- "git diff" family of commands learned --blobfind=<object-name> that
181
- allows you to limit the output only to a change that involves the
182
- named blob object (either changing the contents from or to it).
183
-
184
- Needs review.
185
-
186
-
187
-* sp/doc-info-attributes (2017-11-24) 1 commit
188
- - doc: Mention info/attributes in gitrepository-layout
189
-
190
- Doc update.
191
-
192
- Will merge to 'next'.
193
-
194
-
195
-* tg/worktree-create-tracking (2017-11-24) 4 commits
196
- - worktree: make add <path> dwim
197
- - worktree: make add <path> <branch> dwim
198
- - worktree: add --[no-]track option to the add subcommand
199
- - checkout: factor out functions to new lib file
200
-
201
- The way "git worktree add" determines what branch to create from
202
- where and checkout in the new worktree has been updated a bit.
203
-
204
- Needs review.
205
-
206
---------------------------------------------------
207
-[Stalled]
208
-
209
-* jc/merge-symlink-ours-theirs (2017-09-26) 1 commit
210
- - merge: teach -Xours/-Xtheirs to symbolic link merge
211
-
212
- "git merge -Xours/-Xtheirs" learned to use our/their version when
213
- resolving a conflicting updates to a symbolic link.
214
-
215
- Needs review.
216
-
217
-
218
-* mg/merge-base-fork-point (2017-09-17) 3 commits
219
- - merge-base: find fork-point outside partial reflog
220
- - merge-base: return fork-point outside reflog
221
- - t6010: test actual test output
222
-
223
- "merge-base --fork-point $branch $commit" is used to guess on which
224
- commit among the commits that were once at the tip of the $branch the
225
- $commit was built on top of, and it learns these historical tips from
226
- the reflog of the $branch. When the true fork-point is lost due to
227
- pruning of old reflog entries, the command does not give any output,
228
- because it has no way to guess correctly and does not want to mislead
229
- the user with a wrong guess.
230
-
231
- The command has been updated to give the best but not known to be
232
- correct guess, based on a hope that a merge-base between $commit and a
233
- virtual merge across all the reflog entries that still are available
234
- for $branch may still be a closer to the true fork-point than the
235
- merge-base between $commit and the current tip of the $branch.
236
-
237
- This may have to be offered by an additional option, to allow the
238
- users that are prepared to see a potentially incorrect guess to opt
239
- into the feature, without affecting the current callers that may not
240
- be prepared to accept a guess that is not known to be correct.
241
-
242
- What's the doneness of this one?
243
-
244
-
245
-* jk/drop-ancient-curl (2017-08-09) 5 commits
246
- - http: #error on too-old curl
247
- - curl: remove ifdef'd code never used with curl >=7.19.4
248
- - http: drop support for curl < 7.19.4
249
- - http: drop support for curl < 7.16.0
250
- - http: drop support for curl < 7.11.1
251
-
252
- Some code in http.c that has bitrot is being removed.
253
-
254
- Expecting a reroll.
255
-
256
-
257
-* mk/use-size-t-in-zlib (2017-08-10) 1 commit
258
- . zlib.c: use size_t for size
259
-
260
- The wrapper to call into zlib followed our long tradition to use
261
- "unsigned long" for sizes of regions in memory, which have been
262
- updated to use "size_t".
553
+ - diff: add a new diffcore transformation to find a specific blob
554
264
- Needs resurrecting by making sure the fix is good and still applies
265
- (or adjusted to today's codebase).
555
+ "git diff" family of commands learned --blobfind=<object-name> that
556
+ allows you to limit the output only to a change that involves the
557
+ named blob object (either changing the contents from or to it).
558
559
+ Needs review.
560
268
-* mg/status-in-progress-info (2017-05-10) 2 commits
269
- - status --short --inprogress: spell it as --in-progress
270
- - status: show in-progress info for short status
561
272
- "git status" learns an option to report various operations
273
- (e.g. "merging") that the user is in the middle of.
562
+* sp/doc-info-attributes (2017-11-24) 1 commit
563
+ (merged to 'next' on 2017-11-27 at 4e509c2d25)
564
+ + doc: Mention info/attributes in gitrepository-layout
565
275
- cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>
566
+ Doc update.
567
568
+ Will merge to 'master'.
569
278
-* nd/worktree-move (2017-04-20) 6 commits
279
- - worktree remove: new command
280
- - worktree move: refuse to move worktrees with submodules
281
- - worktree move: accept destination as directory
282
- - worktree move: new command
283
- - worktree.c: add update_worktree_location()
284
- - worktree.c: add validate_worktree()
570
286
- "git worktree" learned move and remove subcommands.
571
+* tg/worktree-create-tracking (2017-11-27) 6 commits
572
+ - add worktree.guessRemote config option
573
+ - worktree: add --guess-remote flag to add subcommand
574
+ - worktree: make add <path> <branch> dwim
575
+ - worktree: add --[no-]track option to the add subcommand
576
+ - worktree: add can be created from any commit-ish
577
+ - checkout: factor out functions to new lib file
578
288
- Expecting a reroll.
289
- cf. <20170420101024.7593-1-pclouds@gmail.com>
290
- cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>
291
- cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>
579
+ The way "git worktree add" determines what branch to create from
580
+ where and checkout in the new worktree has been updated a bit.
581
293
---------------------------------------------------
294
-[Cooking]
582
583
* cc/perf-run-config (2017-09-24) 9 commits
297
- - perf: store subsection results in "test-results/$GIT_PERF_SUBSECTION/"
298
- - perf/run: show name of rev being built
299
- - perf/run: add run_subsection()
300
- - perf/run: update get_var_from_env_or_config() for subsections
301
- - perf/run: add get_subsections()
302
- - perf/run: add calls to get_var_from_env_or_config()
303
- - perf/run: add GIT_PERF_DIRS_OR_REVS
304
- - perf/run: add get_var_from_env_or_config()
305
- - perf/run: add '--config' option to the 'run' script
584
+ (merged to 'next' on 2017-11-27 at d75a2469eb)
585
+ + perf: store subsection results in "test-results/$GIT_PERF_SUBSECTION/"
586
+ + perf/run: show name of rev being built
587
+ + perf/run: add run_subsection()
588
+ + perf/run: update get_var_from_env_or_config() for subsections
589
+ + perf/run: add get_subsections()
590
+ + perf/run: add calls to get_var_from_env_or_config()
591
+ + perf/run: add GIT_PERF_DIRS_OR_REVS
592
+ + perf/run: add get_var_from_env_or_config()
593
+ + perf/run: add '--config' option to the 'run' script
594
307
- Will merge to 'next'.
595
+ Will merge to 'master'.
596
597
598
* pw/sequencer-in-process-commit (2017-11-24) 9 commits
@@ -328,65 +616,13 @@ of the repositories listed at
616
Will merge to and cook in 'next'.
617
618
331
-* ew/rebase-mboxrd (2017-11-18) 1 commit
332
- (merged to 'next' on 2017-11-21 at 88eaaac334)
333
- + rebase: use mboxrd format to avoid split errors
334
-
335
- When "git rebase" prepared an mailbox of changes and fed it to "git
336
- am" to replay them, it was confused when a stray "From " happened
337
- to be in the log message of one of the replayed changes. This has
338
- been corrected.
339
-
340
- Will merge to 'master'.
341
-
342
-
343
-* rs/config-write-section-fix (2017-11-18) 1 commit
344
- (merged to 'next' on 2017-11-21 at a7f3f93e0c)
345
- + config: flip return value of write_section()
346
-
347
- There was a recent semantic mismerge in the codepath to write out a
348
- section of a configuration section, which has been corrected.
349
-
350
- Will merge to 'master'.
351
-
352
-
353
-* ma/branch-list-paginate (2017-11-20) 3 commits
354
- (merged to 'next' on 2017-11-22 at eecd7f2369)
355
- + branch: change default of `pager.branch` to "on"
356
- + branch: respect `pager.branch` in list-mode only
357
- + t7006: add tests for how git branch paginates
358
-
359
- "git branch --list" learned to show its output through the pager by
360
- default when the output is going to a terminal, which is controlled
361
- by the pager.branch configuration variable. This is similar to a
362
- recent change to "git tag --list".
363
-
364
- Will merge to 'master'.
365
-
366
-
367
-* rs/include-comments-before-the-function-header (2017-11-21) 6 commits
368
- (merged to 'next' on 2017-11-22 at d7255a836f)
369
- + grep: show non-empty lines before functions with -W
370
- + grep: update boundary variable for pre-context
371
- + t7810: improve check of -W with user-defined function lines
372
- + xdiff: show non-empty lines before functions with -W
373
- + xdiff: factor out is_func_rec()
374
- + t4051: add test for comments preceding function lines
375
-
376
- "git grep -W", "git diff -W" and their friends learned a heuristic
377
- to extend a pre-context beyond the line that matches the "function
378
- pattern" (aka "diff.*.xfuncname") to include a comment block, if
379
- exists, that immediately precedes it.
380
-
381
- Will merge to 'master'.
382
-
383
-
619
* jk/fewer-pack-rescan (2017-11-22) 5 commits
385
- - sha1_file: fast-path null sha1 as a missing object
386
- - everything_local: use "quick" object existence check
387
- - p5551: add a script to test fetch pack-dir rescans
388
- - t/perf/lib-pack: use fast-import checkpoint to create packs
389
- - p5550: factor out nonsense-pack creation
620
+ (merged to 'next' on 2017-11-27 at 2c35a2d831)
621
+ + sha1_file: fast-path null sha1 as a missing object
622
+ + everything_local: use "quick" object existence check
623
+ + p5551: add a script to test fetch pack-dir rescans
624
+ + t/perf/lib-pack: use fast-import checkpoint to create packs
625
+ + p5550: factor out nonsense-pack creation
626
627
Internaly we use 0{40} as a placeholder object name to signal the
628
codepath that there is no such object (e.g. the fast-forward check
@@ -398,41 +634,20 @@ of the repositories listed at
634
exist however is quite costly with a repository with large number
635
of packfiles. This access pattern has been optimized.
636
401
- Will merge to 'next'.
402
-
403
-
404
-* ks/rebase-no-git-foo (2017-11-21) 1 commit
405
- (merged to 'next' on 2017-11-22 at 336552dbb7)
406
- + git-rebase: clean up dashed-usages in messages
407
-
408
- Mentions of "git-rebase" and "git-am" (dashed form) still remained
409
- in end-user visible strings emitted by the "git rebase" command;
410
- they have been corrected.
411
-
412
- Will merge to 'master'.
413
-
414
-
415
-* sw/pull-ipv46-passthru (2017-11-21) 1 commit
416
- (merged to 'next' on 2017-11-22 at b06021eeba)
417
- + pull: pass -4/-6 option to 'git fetch'
418
-
419
- Contrary to the documentation, "git pull -4/-6 other-args" did not
420
- ask the underlying "git fetch" to go over IPv4/IPv6, which has been
421
- corrected.
422
-
637
Will merge to 'master'.
638
639
640
* jn/ssh-wrappers (2017-11-21) 9 commits
427
- - connect: correct style of C-style comment
428
- - ssh: 'simple' variant does not support --port
429
- - ssh: 'simple' variant does not support -4/-6
430
- - ssh: 'auto' variant to select between 'ssh' and 'simple'
431
- - connect: split ssh option computation to its own function
432
- - connect: split ssh command line options into separate function
433
- - connect: split git:// setup into a separate function
434
- - connect: move no_fork fallback to git_tcp_connect
435
- - ssh test: make copy_ssh_wrapper_as clean up after itself
641
+ (merged to 'next' on 2017-11-27 at 00a2bb7a3c)
642
+ + connect: correct style of C-style comment
643
+ + ssh: 'simple' variant does not support --port
644
+ + ssh: 'simple' variant does not support -4/-6
645
+ + ssh: 'auto' variant to select between 'ssh' and 'simple'
646
+ + connect: split ssh option computation to its own function
647
+ + connect: split ssh command line options into separate function
648
+ + connect: split git:// setup into a separate function
649
+ + connect: move no_fork fallback to git_tcp_connect
650
+ + ssh test: make copy_ssh_wrapper_as clean up after itself
651
(this branch uses bw/protocol-v1.)
652
653
The ssh-variant 'simple' introduced earlier broke existing
@@ -442,69 +657,32 @@ of the repositories listed at
657
to OpenSSH convention and then error out an invocation to make it
658
easier to diagnose connection errors.
659
445
- Will merge to 'next'.
446
-
447
-
448
-* rv/sendemail-tocmd-in-config-and-completion (2017-11-14) 2 commits
449
- (merged to 'next' on 2017-11-20 at 75cf6e2fc3)
450
- + completion: add git config sendemail.tocmd
451
- + Documentation/config: add sendemail.tocmd to list preceding "See git-send-email(1)"
452
-
453
- Teach "sendemail.tocmd" to places that know about "sendemail.to",
454
- like documentation and shell completion (in contrib/).
455
-
456
- Will merge to 'master'.
457
-
458
-
459
-* tz/notes-error-to-stderr (2017-11-15) 1 commit
460
- (merged to 'next' on 2017-11-20 at a45d441ee2)
461
- + notes: send "Automatic notes merge failed" messages to stderr
462
-
463
- "git notes" sent its error message to its standard output stream,
464
- which was corrected.
465
-
660
Will merge to 'master'.
661
662
663
* hm/config-parse-expiry-date (2017-11-18) 1 commit
470
- - config: add --expiry-date
664
+ (merged to 'next' on 2017-11-27 at 20014f5541)
665
+ + config: add --expiry-date
666
667
"git config --expiry-date gc.reflogexpire" can read "2.weeks" from
668
the configuration and report it as a timestamp, just like "--int"
669
would read "1k" and report 1024, to help consumption by scripts.
670
476
- Will merge to 'next'.
477
-
478
-
479
-* sd/branch-copy (2017-11-16) 1 commit
480
- (merged to 'next' on 2017-11-20 at e33bcc460a)
481
- + config: avoid "write_in_full(fd, buf, len) != len" pattern
482
-
483
- Code clean-up.
484
-
485
- Will merge to 'master'.
486
-
487
-
488
-* pw/sequencer-recover-from-unlockable-index (2017-11-16) 1 commit
489
- (merged to 'next' on 2017-11-20 at 36f0ed26ce)
490
- + sequencer: reschedule pick if index can't be locked
491
-
492
- The sequencer machinery (used by "git cherry-pick A..B", and "git
493
- rebase -i", among other things) would have lost a commit if stopped
494
- due to an unlockable index file, which has been fixed.
495
-
671
Will merge to 'master'.
672
673
499
-* dj/runtime-prefix (2017-11-20) 1 commit
674
+* dj/runtime-prefix (2017-11-28) 4 commits
675
- exec_cmd: RUNTIME_PREFIX on some POSIX systems
676
+ - Makefile: add Perl runtime prefix support
677
+ - Makefile: add support for "perllibdir"
678
+ - Makefile: generate Perl header from template file
679
680
A build-time option has been added to allow Git to be told to refer
681
to its associated files relative to the main binary, in the same
682
way that has been possible on Windows for quite some time, for
683
Linux, BSDs and Darwin.
684
507
- A part of this that deals with Perl is still being discussed.
685
+ Will merge to 'next'.
686
687
688
* jc/editor-waiting-message (2017-11-17) 1 commit
@@ -518,69 +696,15 @@ of the repositories listed at
696
Will merge to 'next'.
697
698
521
-* rs/apply-inaccurate-eof-with-incomplete-line (2017-11-17) 1 commit
522
- (merged to 'next' on 2017-11-20 at c8aee1d135)
523
- + apply: update line lengths for --inaccurate-eof
524
-
525
- "git apply --inaccurate-eof" when used with "--ignore-space-change"
526
- triggered an internal sanity check, which has been fixed.
527
-
528
- Will merge to 'master'.
529
-
530
-
699
* tz/branch-doc-remove-set-upstream (2017-11-17) 1 commit
532
- - branch doc: remove --set-upstream from synopsis
700
+ (merged to 'next' on 2017-11-27 at 8fcad3f6e7)
701
+ + branch doc: remove --set-upstream from synopsis
702
703
"git branch --set-upstream" has been deprecated and (sort of)
704
removed, as "--set-upstream-to" is the preferred one these days.
705
The documentation still had "--set-upstream" listed on its
706
synopsys section, which has been corrected.
707
539
- Will merge to 'next'.
540
-
541
-
542
-* tz/complete-branch-copy (2017-11-17) 1 commit
543
- (merged to 'next' on 2017-11-20 at 6d22384fcd)
544
- + completion: add '--copy' option to 'git branch'
545
-
546
- Command line completion (in contrib/) has been taught about the
547
- "--copy" option of "git branch".
548
-
549
- Will merge to 'master'.
550
-
551
-
552
-* jc/branch-name-sanity (2017-11-15) 4 commits
553
- (merged to 'next' on 2017-11-20 at 7236b0dde3)
554
- + builtin/branch: remove redundant check for HEAD
555
- + branch: correctly reject refs/heads/{-dash,HEAD}
556
- + branch: split validate_new_branchname() into two
557
- + branch: streamline "attr_only" handling in validate_new_branchname()
558
-
559
- "git branch" and "git checkout -b" are now forbidden from creating
560
- a branch whose name is "HEAD".
561
-
562
- Will merge to 'master'.
563
-
564
-
565
-* jc/merge-base-fork-point-doc (2017-11-09) 1 commit
566
- (merged to 'next' on 2017-11-20 at 199b9255b4)
567
- + merge-base --fork-point doc: clarify the example and failure modes
568
-
569
- Clarify and enhance documentation for "merge-base --fork-point", as
570
- it was clear what it computed but not why/what for.
571
-
572
- Will merge to 'master'.
573
-
574
-
575
-* sb/test-cherry-pick-submodule-getting-in-a-way (2017-11-15) 2 commits
576
- (merged to 'next' on 2017-11-20 at fe7016689e)
577
- + merge-recursive: handle addition of submodule on our side of history
578
- + t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failure
579
-
580
- The three-way merge performed by "git cherry-pick" was confused
581
- when a new submodule was added in the meantime, which has been
582
- fixed (or "papered over").
583
-
708
Will merge to 'master'.
709
710
@@ -598,23 +722,15 @@ of the repositories listed at
722
Will cook in 'next'.
723
724
601
-* tz/redirect-fix (2017-11-14) 2 commits
602
- (merged to 'next' on 2017-11-20 at 5b13f7026e)
603
- + rebase: fix stderr redirect in apply_autostash()
604
- + t/lib-gpg: fix gpgconf stderr redirect to /dev/null
605
-
606
- A few scripts (both in production and tests) incorrectly redirected
607
- their error output. These have been corrected.
608
-
609
- Will merge to 'master'.
610
-
611
-
612
-* ar/unconfuse-three-dots (2017-11-20) 5 commits
613
- - Testing: provide tests requiring them with ellipses after SHA-1 values
725
+* ar/unconfuse-three-dots (2017-11-26) 8 commits
726
+ - t4013: test new output from diff --abbrev --raw
727
+ - t4013: prepare for upcoming "diff --raw --abbrev" output format change
728
+ - Testing: provide existing tests requiring them with ellipses after SHA-1 values
729
+ - Documentation: git: document GIT_PRINT_SHA1_ELLIPSIS
730
- Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").
731
- Documentation: user-manual: limit usage of ellipsis
616
- - diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value
732
- checkout: describe_detached_head: remove ellipsis after committish
733
+ - diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value
734
735
Ancient part of codebase still shows dots after an abbreviated
736
object name just to show that it is not a full object name, but
@@ -622,26 +738,22 @@ of the repositories listed at
738
who are used to seeing abbreviated object names and find them
739
confusing with the range syntax.
740
625
- Will merge to 'next'.
626
- The tests may need to be updated to cover both old and new output,
627
- but that can happen in follow-up series.
628
- cf. <xmqqo9nuuadm.fsf@gitster.mtv.corp.google.com>
629
-
741
742
* jh/object-filtering (2017-11-22) 6 commits
632
- - pack-objects: add list-objects filtering
633
- - rev-list: add list-objects filtering support
634
- - list-objects: filter objects in traverse_commit_list
635
- - oidset: add iterator methods to oidset
636
- - oidmap: add oidmap iterator methods
637
- - dir: allow exclusions from blob in addition to file
743
+ (merged to 'next' on 2017-11-27 at e5008c3b28)
744
+ + pack-objects: add list-objects filtering
745
+ + rev-list: add list-objects filtering support
746
+ + list-objects: filter objects in traverse_commit_list
747
+ + oidset: add iterator methods to oidset
748
+ + oidmap: add oidmap iterator methods
749
+ + dir: allow exclusions from blob in addition to file
750
(this branch is used by jh/fsck-promisors and jh/partial-clone.)
751
752
In preparation for implementing narrow/partial clone, the object
753
walking machinery has been taught a way to tell it to "filter" some
754
objects from enumeration.
755
644
- Will merge to 'next'.
756
+ Will merge to 'master'.
757
758
759
* jh/fsck-promisors (2017-11-22) 10 commits
@@ -702,17 +814,6 @@ of the repositories listed at
814
<commit-ish>:<path> that refers to a given blob object.
815
816
705
-* tb/add-renormalize (2017-11-17) 1 commit
706
- (merged to 'next' on 2017-11-20 at e302f3591f)
707
- + add: introduce "--renormalize"
708
-
709
- "git add --renormalize ." is a new and safer way to record the fact
710
- that you are correcting the end-of-line convention and other
711
- "convert_to_git()" glitches in the in-repository data.
712
-
713
- Will merge to 'master'.
714
-
715
-
817
* pb/bisect-helper-2 (2017-10-28) 8 commits
818
- t6030: make various test to pass GETTEXT_POISON tests
819
- bisect--helper: `bisect_start` shell function partially in C
@@ -727,17 +828,6 @@ of the repositories listed at
828
cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
829
830
730
-* jc/ignore-cr-at-eol (2017-11-08) 2 commits
731
- (merged to 'next' on 2017-11-20 at 9f7bae7cbd)
732
- + diff: --ignore-cr-at-eol
733
- + xdiff: reassign xpparm_t.flags bits
734
-
735
- The "diff" family of commands learned to ignore differences in
736
- carriage return at the end of line.
737
-
738
- Will merge to 'master'.
739
-
740
-
831
* ot/mru-on-list (2017-10-01) 1 commit
832
- mru: use double-linked list from list.h
833
@@ -761,108 +851,51 @@ of the repositories listed at
851
852
853
* bw/protocol-v1 (2017-10-17) 11 commits
764
- - Documentation: document Extra Parameters
765
- - ssh: introduce a 'simple' ssh variant
766
- - i5700: add interop test for protocol transition
767
- - http: tell server that the client understands v1
768
- - connect: tell server that the client understands v1
769
- - connect: teach client to recognize v1 server response
770
- - upload-pack, receive-pack: introduce protocol version 1
771
- - daemon: recognize hidden request arguments
772
- - protocol: introduce protocol extension mechanisms
773
- - pkt-line: add packet_write function
774
- - connect: in ref advertisement, shallows are last
854
+ (merged to 'next' on 2017-11-27 at 55040d09ec)
855
+ + Documentation: document Extra Parameters
856
+ + ssh: introduce a 'simple' ssh variant
857
+ + i5700: add interop test for protocol transition
858
+ + http: tell server that the client understands v1
859
+ + connect: tell server that the client understands v1
860
+ + connect: teach client to recognize v1 server response
861
+ + upload-pack, receive-pack: introduce protocol version 1
862
+ + daemon: recognize hidden request arguments
863
+ + protocol: introduce protocol extension mechanisms
864
+ + pkt-line: add packet_write function
865
+ + connect: in ref advertisement, shallows are last
866
(this branch is used by jn/ssh-wrappers.)
867
868
A new mechanism to upgrade the wire protocol in place is proposed
869
and demonstrated that it works with the older versions of Git
870
without harming them.
871
781
- Will merge to 'next'.
872
+ Will merge to 'master'.
873
874
784
-* bc/hash-algo (2017-11-13) 4 commits
785
- - Switch empty tree and blob lookups to use hash abstraction
786
- - Integrate hash algorithm support with repo setup
787
- - Add structure representing hash algorithm
788
- - setup: expose enumerated repo info
875
+* bc/hash-algo (2017-11-28) 5 commits
876
+ (merged to 'next' on 2017-11-28 at 5c74632345)
877
+ + repository: fix a sparse 'using integer as NULL pointer' warning
878
+ (merged to 'next' on 2017-11-27 at 98cc9ef2a8)
879
+ + Switch empty tree and blob lookups to use hash abstraction
880
+ + Integrate hash algorithm support with repo setup
881
+ + Add structure representing hash algorithm
882
+ + setup: expose enumerated repo info
883
884
An infrastructure to define what hash function is used in Git is
885
introduced, and an effort to plumb that throughout various
886
codepaths has been started.
887
794
- Will merge to 'next'.
888
+ Will merge to 'master'.
889
890
891
* sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits
798
- - Documentation/checkout: clarify submodule HEADs to be detached
799
- - recursive submodules: detach HEAD from new state
892
+ (merged to 'next' on 2017-11-27 at 6584ec1a65)
893
+ + Documentation/checkout: clarify submodule HEADs to be detached
894
+ + recursive submodules: detach HEAD from new state
895
896
"git checkout --recursive" may overwrite and rewind the history of
897
the branch that happens to be checked out in submodule
898
repositories, which might not be desirable. Detach the HEAD but
899
still allow the recursive checkout to succeed in such a case.
900
806
- Will merge to 'next'.
807
-
808
---------------------------------------------------
809
-[Discarded]
810
-
811
-* jk/ui-color-always-to-auto-maint (2017-10-13) 2 commits
812
- . color: document that "git -c color.*=always" is a bit special
813
- . color: downgrade "always" to "auto" only for on-disk configuration
814
-
815
- It turns out that "git -c color.ui=always cmd" is relied on by many
816
- third-party tools as a way to force coloured output no matter what
817
- the end-user configuration is, and a recent attempt to downgrade
818
- 'always' to 'auto' to fix the regression to "git add -p" broke it.
819
-
820
- This has been reverted from 'next'.
821
-
822
-
823
-* jt/partial-clone-lazy-fetch (2017-10-02) 18 commits
824
- . fetch-pack: restore save_commit_buffer after use
825
- . unpack-trees: batch fetching of missing blobs
826
- . clone: configure blobmaxbytes in created repos
827
- . clone: support excluding large blobs
828
- . fetch: support excluding large blobs
829
- . fetch: refactor calculation of remote list
830
- . fetch-pack: support excluding large blobs
831
- . pack-objects: support --blob-max-bytes
832
- . pack-objects: rename want_.* to ignore_.*
833
- . gc: do not repack promisor packfiles
834
- . rev-list: support termination at promisor objects
835
- . sha1_file: support lazily fetching missing objects
836
- . introduce fetch-object: fetch one promisor object
837
- . index-pack: refactor writing of .keep files
838
- . fsck: support promisor objects as CLI argument
839
- . fsck: support referenced promisor objects
840
- . fsck: support refs pointing to promisor objects
841
- . fsck: introduce partialclone extension
842
-
843
- A journey for "git clone" and "git fetch" to become "lazier" by
844
- depending more on its remote repository---this is the beginning of
845
- it.
846
-
847
- Superseded by three topics that end with jh/partial-clone.
848
-
849
-
850
-* jh/dir-add-exclude-from-blob (2017-10-27) 1 commit
851
- . dir: allow exclusions from blob in addition to file
852
-
853
- The code to read exclusion list from a blob, which is used when the
854
- .gitignore file is outside a sparse checkout area, has been
855
- refactored so that other codepath can later use it to do the same
856
- outside the context of "sparse checkout".
857
-
858
- Now part of jh/object-filtering topic.
859
-
860
-
861
-* bp/fastindex (2017-11-11) 5 commits
862
- . SQUASH???
863
- . fastindex: add documentation for the fastindex extension
864
- . fastindex: add test tools and a test script
865
- . update-index: add fastindex support to update-index
866
- . fastindex: speed up index load through parallelization
867
-
868
- Retracted for now.
901
+ Will merge to 'master'.