What's cooking (2020/02 #01)
Junio C Hamano committed
Feb 5, 2020 at 15:26 UTC
9e8b12a1235c4d102d7f278fbae37642cc63fce0
1 file changed
+726
-419
whats-cooking.txt
+726
-419
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Jan 2020, #04; Wed, 22)
4
-X-master-at: 232378479ee6c66206d47a9be175e3a39682aea6
5
-X-next-at: 3f081b084b0e55662871946d66dab3696a46a22a
3
+Subject: What's cooking in git.git (Feb 2020, #01; Wed, 5)
4
+X-master-at: 5b0ca878e008e82f91300091e793427205ce3544
5
+X-next-at: 125e21ebc739270a5a8f79e34da06ce072caa338
6
7
-What's cooking in git.git (Jan 2020, #04; Wed, 22)
7
+What's cooking in git.git (Feb 2020, #01; Wed, 5)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,10 +12,6 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-Git 2.25 is out. The tip of 'next' has been rewound and a handful
16
-of topics have been rebased to avoid the premature merge of
17
-ra/rebase-i-more-options which has been reverted.
18
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
@@ -24,126 +20,108 @@ of the repositories listed at
20
--------------------------------------------------
21
[Graduated to "master"]
22
27
-* do/gitweb-typofix-in-comments (2020-01-04) 1 commit
28
- (merged to 'next' on 2020-01-06 at 66ce6539c4)
29
- + gitweb: fix a couple spelling errors in comments
30
-
31
- Typofix.
32
-
33
-
34
-* ds/graph-assert-fix (2020-01-08) 2 commits
35
- (merged to 'next' on 2020-01-08 at 4b896fb9b5)
36
- + graph: fix lack of color in horizontal lines
37
- + graph: drop assert() for merge with two collapsing parents
38
- (this branch is used by ds/graph-horizontal-edges.)
39
-
40
- Since recent updates to the log graph rendering code, drawing
41
- certain merges started triggering an assert on a condition that
42
- would no longer hold true, which has been corrected.
43
-
44
-
45
-* jb/doc-multi-pack-idx-fix (2020-01-04) 1 commit
46
- (merged to 'next' on 2020-01-06 at f19f7d1016)
47
- + multi-pack-index: correct configuration in documentation
23
+* am/test-pathspec-f-f-error-cases (2020-01-15) 1 commit
24
+ (merged to 'next' on 2020-01-22 at cc526bc5ea)
25
+ + t: add tests for error conditions with --pathspec-from-file
26
49
- Typofix.
27
+ More tests.
28
29
52
-* js/mingw-loosen-overstrict-tree-entry-checks (2020-01-10) 1 commit
53
- (merged to 'next' on 2020-01-10 at f43f0fe74b)
54
- + mingw: safeguard better against backslashes in file names
30
+* am/update-pathspec-f-f-tests (2020-01-15) 2 commits
31
+ (merged to 'next' on 2020-01-22 at 5d050a14df)
32
+ + t: directly test parse_pathspec_file()
33
+ + t: fix quotes tests for --pathspec-from-file
34
56
- Further tweak to a "no backslash in indexed paths" for Windows port
57
- we applied earlier.
35
+ Test updates.
36
37
60
-* ma/config-advice-markup-fix (2020-01-08) 1 commit
61
- (merged to 'next' on 2020-01-09 at 1c4b540795)
62
- + config/advice.txt: fix description list separator
38
+* bc/actualmente (2020-01-21) 1 commit
39
+ (merged to 'next' on 2020-01-22 at 6ce9cf0951)
40
+ + docs: use "currently" for the present time
41
64
- Documentation markup fix.
42
+ Doc grammo fix.
43
44
67
-* pm/am-in-body-header-doc-update (2020-01-04) 1 commit
68
- (merged to 'next' on 2020-01-06 at 73b0a3a49c)
69
- + am: document that Date: can appear as an in-body header
45
+* bc/author-committer-doc (2020-01-22) 3 commits
46
+ (merged to 'next' on 2020-01-22 at 61164cc62a)
47
+ + doc: provide guidance on user.name format
48
+ + docs: expand on possible and recommended user config options
49
+ + doc: move author and committer information to git-commit(1)
50
71
- Doc update.
51
+ Clarify documentation on committer/author identities.
52
53
74
-* tm/doc-submodule-absorb-fix (2020-01-06) 1 commit
75
- (merged to 'next' on 2020-01-07 at cee89422db)
76
- + doc: submodule: fix typo for command absorbgitdirs
54
+* bc/misconception-doc (2020-01-22) 2 commits
55
+ (merged to 'next' on 2020-01-22 at 6abc06b798)
56
+ + docs: mention when increasing http.postBuffer is valuable
57
+ + doc: dissuade users from trying to ignore tracked files
58
78
- Typofix.
59
+ Doc updates.
60
80
---------------------------------------------------
81
-[New Topics]
61
83
-* en/simplify-check-updates-in-unpack-trees (2020-01-07) 1 commit
84
- (merged to 'next' on 2020-01-15 at 586c055b69)
85
- + unpack-trees: exit check_updates() early if updates are not wanted
62
+* bc/run-command-nullness-after-free-fix (2020-01-07) 1 commit
63
+ (merged to 'next' on 2020-01-15 at 56b3148fee)
64
+ + run-command: avoid undefined behavior in exists_in_PATH
65
66
Originally merged to 'next' on 2020-01-09
67
89
- Code simplification.
90
-
91
- Will merge to 'master'.
68
+ C pedantry ;-) fix.
69
70
94
-* en/string-list-can-be-custom-sorted (2020-01-07) 1 commit
95
- (merged to 'next' on 2020-01-15 at 2afe9536e6)
96
- + string-list: note in docs that callers can specify sorting function
71
+* dl/credential-netrc (2019-12-20) 2 commits
72
+ (merged to 'next' on 2020-01-15 at 768fa1c364)
73
+ + contrib/credential/netrc: work outside a repo
74
+ + contrib/credential/netrc: make PERL_PATH configurable
75
98
- Originally merged to 'next' on 2020-01-09
76
+ Originally merged to 'next' on 2019-12-25
77
100
- API-doc update.
78
+ Sample credential helper for using .netrc has been updated to work
79
+ out of the box.
80
102
- Will merge to 'master'.
81
82
+* ds/graph-horizontal-edges (2020-01-15) 2 commits
83
+ (merged to 'next' on 2020-01-22 at 4d94d5800f)
84
+ + graph: fix collapse of multiple edges
85
+ + graph: add test to demonstrate horizontal line bug
86
105
-* am/checkout-file-and-ref-ref-ambiguity (2020-01-07) 2 commits
106
- - checkout: don't revert file on ambiguous tracking branches
107
- - parse_branchname_arg(): extract part as new function
87
+ Rendering by "git log --graph" of ancestry lines leading to a merge
88
+ commit were made suboptimal to waste vertical space a bit with a
89
+ recent update, which has been corrected.
90
109
- "git checkout X" did not correctly fail when X is not a local
110
- branch but could name more than one remote-tracking branches
111
- (i.e. to be dwimmed as the starting point to create a corresponding
112
- local branch), which has been corrected.
91
114
- Will merge to 'next'.
92
+* ds/refmap-doc (2020-01-21) 1 commit
93
+ (merged to 'next' on 2020-01-22 at 51d81a499b)
94
+ + fetch: document and test --refmap=""
95
96
+ "git fetch --refmap=" option has got a better documentation.
97
117
-* am/update-pathspec-f-f-tests (2020-01-15) 2 commits
118
- - t: directly test parse_pathspec_file()
119
- - t: fix quotes tests for --pathspec-from-file
98
121
- Test updates.
99
+* ds/sparse-cone (2020-01-10) 1 commit
100
+ (merged to 'next' on 2020-01-22 at bfca10dcd7)
101
+ + unpack-trees: correctly compute result count
102
123
- Will merge to 'next'.
103
+ The code recently added in this release to move to the entry beyond
104
+ the ones in the same directory in the index in the sparse-cone mode
105
+ did not count the number of entries to skip over incorrectly, which
106
+ has been corrected.
107
108
126
-* bc/run-command-nullness-after-free-fix (2020-01-07) 1 commit
127
- (merged to 'next' on 2020-01-15 at 56b3148fee)
128
- + run-command: avoid undefined behavior in exists_in_PATH
109
+* en/simplify-check-updates-in-unpack-trees (2020-01-07) 1 commit
110
+ (merged to 'next' on 2020-01-15 at 586c055b69)
111
+ + unpack-trees: exit check_updates() early if updates are not wanted
112
113
Originally merged to 'next' on 2020-01-09
114
132
- C pedantry ;-) fix.
133
-
134
- Will merge to 'master'.
115
+ Code simplification.
116
117
137
-* kw/fsmonitor-watchman-racefix (2020-01-13) 4 commits
138
- - fsmonitor: update documentation for hook version and watchman hooks
139
- - fsmonitor: add fsmonitor hook scripts for version 2
140
- - fsmonitor: handle version 2 of the hooks that will use opaque token
141
- - fsmonitor: change last update timestamp on the index_state to opaque token
118
+* en/string-list-can-be-custom-sorted (2020-01-07) 1 commit
119
+ (merged to 'next' on 2020-01-15 at 2afe9536e6)
120
+ + string-list: note in docs that callers can specify sorting function
121
143
- A new version of fsmonitor-watchman hook has been introduced, to
144
- avoid races.
122
+ Originally merged to 'next' on 2020-01-09
123
146
- Will merge to 'next'.
124
+ API-doc update.
125
126
127
* es/unpack-trees-oob-fix (2020-01-08) 1 commit
@@ -156,16 +134,33 @@ of the repositories listed at
134
single directory using the cache-tree was not careful enough
135
against corrupt index file.
136
159
- Will merge to 'master'.
137
138
+* hi/gpg-mintrustlevel (2020-01-15) 1 commit
139
+ (merged to 'next' on 2020-01-22 at af9f594eb7)
140
+ + gpg-interface: add minTrustLevel as a configuration option
141
162
-* hw/advice-add-nothing (2020-01-15) 1 commit
163
- - add: use advise function to display hints
142
+ gpg.minTrustLevel configuration variable has been introduced to
143
+ tell various signature verification codepaths the required minimum
144
+ trust level.
145
165
- Two help messages given when "git add" notices the user gave it
166
- nothing to add have been updated to use advise() API.
146
168
- Will merge to 'next'.
147
+* hi/indent-text-with-tabs-in-editorconfig (2020-01-06) 1 commit
148
+ (merged to 'next' on 2020-01-22 at 3b567252eb)
149
+ + editorconfig: indent text files with tabs
150
+
151
+ Tell .editorconfig that in this project, *.txt files are indented
152
+ with tabs.
153
+
154
+
155
+* hw/commit-advise-while-rejecting (2019-12-19) 1 commit
156
+ (merged to 'next' on 2020-01-15 at 4f16e5a3b6)
157
+ + commit: honor advice.statusHints when rejecting an empty commit
158
+
159
+ Originally merged to 'next' on 2019-12-30
160
+
161
+ "git commit" gives output similar to "git status" when there is
162
+ nothing to commit, but without honoring the advise.statusHints
163
+ configuration variable, which has been corrected.
164
165
166
* hw/tutorial-favor-switch-over-checkout (2020-01-08) 1 commit
@@ -177,7 +172,14 @@ of the repositories listed at
172
Complete an update to tutorial that encourages "git switch" over
173
"git checkout" that was done only half-way.
174
180
- Will merge to 'master'.
175
+
176
+* jk/asan-build-fix (2020-01-16) 1 commit
177
+ (merged to 'next' on 2020-01-22 at 0fc7123d8b)
178
+ + Makefile: use compat regex with SANITIZE=address
179
+
180
+ Work around test breakages caused by custom regex engine used in
181
+ libasan, when address sanitizer is used with more recent versions
182
+ of gcc and clang.
183
184
185
* jk/no-flush-upon-disconnecting-slrpc-transport (2020-01-08) 1 commit
@@ -189,7 +191,53 @@ of the repositories listed at
191
Reduce unnecessary round-trip when running "ls-remote" over the
192
stateless RPC mechanism.
193
192
- Will merge to 'master'.
194
+
195
+* jk/test-fixes (2020-01-16) 2 commits
196
+ (merged to 'next' on 2020-01-22 at fb7dbf8b85)
197
+ + t7800: don't rely on reuse_worktree_file()
198
+ + t4018: drop "debugging" cat from hunk-header tests
199
+
200
+ Test fixes.
201
+
202
+
203
+* jn/test-lint-one-shot-export-to-shell-function (2020-01-15) 3 commits
204
+ (merged to 'next' on 2020-01-22 at 03cfc1ea0d)
205
+ + fetch test: mark test of "skipping" haves as v0-only
206
+ + t/check-non-portable-shell: detect "FOO= shell_func", too
207
+ + fetch test: avoid use of "VAR= cmd" with a shell function
208
+ (this branch is used by jn/promote-proto2-to-default.)
209
+
210
+ The test-lint machinery knew to check "VAR=VAL shell_function"
211
+ construct, but did not check "VAR= shell_funciton", which has been
212
+ corrected.
213
+
214
+
215
+* js/builtin-add-i-cmds (2020-01-16) 2 commits
216
+ (merged to 'next' on 2020-01-22 at 3cf944ae32)
217
+ + built-in add -i: accept open-ended ranges again
218
+ + built-in add -i: do not try to `patch`/`diff` an empty list of files
219
+
220
+ Minor bugfixes to "git add -i" that has recently been rewritten in C.
221
+
222
+
223
+* jt/sha1-file-remove-oi-skip-cached (2020-01-02) 1 commit
224
+ (merged to 'next' on 2020-01-15 at 4feaff54f3)
225
+ + sha1-file: remove OBJECT_INFO_SKIP_CACHED
226
+
227
+ Originally merged to 'next' on 2020-01-04
228
+
229
+ has_object_file() said "no" given an object registered to the
230
+ system via pretend_object_file(), making it inconsistent with
231
+ read_object_file(), causing lazy fetch to attempt fetching an
232
+ empty tree from promisor remotes.
233
+
234
+
235
+* lh/bool-to-type-bool (2020-01-21) 1 commit
236
+ (merged to 'next' on 2020-01-22 at 3c140f479f)
237
+ + templates: fix deprecated type option `--bool`
238
+
239
+ Replace "git config --bool" calls with "git config --type=bool" in
240
+ sample templates.
241
242
243
* nd/switch-and-restore (2020-01-08) 1 commit
@@ -202,200 +250,465 @@ of the repositories listed at
250
structure, resulting in bogus trees to be written afterwards, which
251
has been corrected.
252
253
+
254
+* rt/submodule-i18n (2020-01-16) 1 commit
255
+ (merged to 'next' on 2020-01-22 at 6b6a52dbe3)
256
+ + submodule.c: mark more strings for translation
257
+
258
+ Comments update.
259
+
260
+
261
+* sg/completion-worktree (2020-01-15) 6 commits
262
+ (merged to 'next' on 2020-01-22 at 9d18889fea)
263
+ + completion: list paths and refs for 'git worktree add'
264
+ + completion: list existing working trees for 'git worktree' subcommands
265
+ + completion: simplify completing 'git worktree' subcommands and options
266
+ + completion: return the index of found word from __git_find_on_cmdline()
267
+ + completion: clean up the __git_find_on_cmdline() helper function
268
+ + t9902-completion: add tests for the __git_find_on_cmdline() helper
269
+
270
+ The command line completion (in contrib/) learned to complete
271
+ subcommands and arguments to "git worktree".
272
+
273
+
274
+* ss/t6025-modernize (2020-01-21) 2 commits
275
+ (merged to 'next' on 2020-01-22 at 00ed0a98ee)
276
+ + t6025: use helpers to replace test -f <path>
277
+ + t6025: modernize style
278
+
279
+ Test style updates.
280
+
281
+--------------------------------------------------
282
+[New Topics]
283
+
284
+* bw/remote-rename-update-config (2020-01-28) 7 commits
285
+ - SQUASH??? test_config cannot be used inside a subshell
286
+ - remote rename/remove: gently handle remote.pushDefault config
287
+ - config: provide access to the current line number
288
+ - remote rename/remove: handle branch.<name>.pushRemote config values
289
+ - remote: clean-up config callback
290
+ - remote: clean-up by returning early to avoid one indentation
291
+ - pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
292
+ (this branch uses mr/show-config-scope.)
293
+
294
+ "git remote rename X Y" needs to adjust configuration variables
295
+ (e.g. branch.<name>.remote) whose value used to be X to Y.
296
+ branch.<name>.pushRemote is now also updated.
297
+
298
+ Waiting for mr/show-config-scope to stabilize.
299
+
300
+
301
+* es/bright-colors (2020-01-23) 3 commits
302
+ - color.c: alias RGB colors 8-15 to aixterm colors
303
+ - color.c: support bright aixterm colors
304
+ - color.c: refactor color_output arguments
305
+
306
+ The basic 7 colors learned the brighter counterparts
307
+ (e.g. "brightred").
308
+
309
+ Expecting a reroll.
310
+ cf. <xmqqmuagbsyw.fsf@gitster-ct.c.googlers.com>
311
+ cf. <xmqqo8ut3hsu.fsf@gitster-ct.c.googlers.com>
312
+
313
+
314
+* mt/sparse-checkout-doc-update (2020-01-23) 2 commits
315
+ (merged to 'next' on 2020-01-27 at dbd5a83613)
316
+ + completion: add support for sparse-checkout
317
+ + doc: sparse-checkout: mention --cone option
318
+
319
+ Doc update.
320
+
321
Will merge to 'master'.
322
323
208
-* ds/graph-horizontal-edges (2020-01-15) 2 commits
209
- - graph: fix collapse of multiple edges
210
- - graph: add test to demonstrate horizontal line bug
324
+* pk/status-of-uncloned-submodule (2020-02-04) 3 commits
325
+ - t7400: testcase for submodule status on unregistered inner git repos
326
+ - submodule: fix status of initialized but not cloned submodules
327
+ - t7400: add a testcase for submodule status on empty dirs
328
212
- Rendering by "git log --graph" of ancestry lines leading to a merge
213
- commit were made suboptimal to waste vertical space a bit with a
214
- recent update, which has been corrected.
329
+ The way "git submodule status" reports an initialized but not yet
330
+ populated submodule has not been reimplemented correctly when a
331
+ part of the "git submodule" command was rewritten in C, which has
332
+ been corrected.
333
334
Will merge to 'next'.
335
336
219
-* ds/sparse-cone (2020-01-10) 1 commit
220
- - unpack-trees: correctly compute result count
337
+* ag/rebase-avoid-unneeded-checkout (2020-01-24) 1 commit
338
+ - rebase -i: stop checking out the tip of the branch to rebase
339
222
- The code recently added in this release to move to the entry beyond
223
- the ones in the same directory in the index in the sparse-cone mode
224
- did not count the number of entries to skip over incorrectly, which
225
- has been corrected.
340
+ "git rebase -i" (and friends) used to unnecessarily check out the
341
+ tip of the branch to be rebased, which has been corrected.
342
343
Will merge to 'next'.
344
345
230
-* km/submodule-add-errmsg (2020-01-15) 1 commit
231
- - submodule add: show 'add --dry-run' stderr when aborting
346
+* ds/sparse-checkout-harden (2020-01-31) 15 commits
347
+ - sparse-checkout: fix cone mode behavior mismatch
348
+ - sparse-checkout: improve docs around 'set' in cone mode
349
+ - sparse-checkout: escape all glob characters on write
350
+ - sparse-checkout: use C-style quotes in 'list' subcommand
351
+ - sparse-checkout: unquote C-style strings over --stdin
352
+ - sparse-checkout: write escaped patterns in cone mode
353
+ - sparse-checkout: properly match escaped characters
354
+ - sparse-checkout: warn on globs in cone patterns
355
+ - sparse-checkout: detect short patterns
356
+ - sparse-checkout: cone mode does not recognize "**"
357
+ - sparse-checkout: fix documentation typo for core.sparseCheckoutCone
358
+ - clone: fix --sparse option with URLs
359
+ - sparse-checkout: create leading directories
360
+ - t1091: improve here-docs
361
+ - t1091: use check_files to reduce boilerplate
362
+
363
+ Some rough edges in the sparse-checkout feature, especially around
364
+ the cone mode, have been cleaned up.
365
233
- Improve error message generation for "git submodule add".
366
+ Will merge to 'next'.
367
+
368
+
369
+* es/doc-mentoring (2020-01-24) 1 commit
370
+ - MyFirstContribution: add avenues for getting help
371
+
372
+ Doc for new contributors.
373
374
Will merge to 'next'.
375
376
238
-* en/fill-directory-fixes-more (2020-01-16) 4 commits
239
- - dir: point treat_leading_path() warning to the right place
240
- - dir: restructure in a way to avoid passing around a struct dirent
241
- - dir: treat_leading_path() and read_directory_recursive(), round 2
242
- - clean: demonstrate a bug with pathspecs
377
+* mr/show-config-scope (2020-01-28) 6 commits
378
+ - config: add '--show-scope' to print the scope of a config value
379
+ - config: clarify meaning of command line scoping
380
+ - config: split repo scope to local and worktree
381
+ - t1300: create custom config file without special characters
382
+ - t1300: fix over-indented HERE-DOCs
383
+ - config: fix typo in variable name
384
+ (this branch is used by bw/remote-rename-update-config.)
385
244
- Corner case bugs in "git clean" that stems from a (necessarily for
245
- performance reasons) awkward calling convention in the directory
246
- enumeration API has been corrected.
386
+ "git config" learned to show in which "scope", in addition to in
387
+ which file, each config setting comes from.
388
+
389
+ Expecting a (hopefully final) reroll.
390
+ cf. <CAOjrSZtx+Qr4HsaptaxseTa_8oCwRyVE+Jf95_z51fGmXBjsTQ@mail.gmail.com>
391
+
392
+
393
+* bk/p4-pre-edit-changelist (2020-02-04) 4 commits
394
+ - git-p4: add p4 submit hooks
395
+ - git-p4: add hook p4-pre-edit-changelist
396
+ - git-p4: create new method gitRunHook
397
+ - git-p4: rewrite prompt to be Windows compatible
398
+
399
+ "git p4" learned four new hooks and also "--no-verify" option to
400
+ bypass them (and the existing "p4-pre-submit" hook).
401
+
402
+ May want to be split better, but the endgame seemed sensible.
403
+ cf. <xmqqmu9y6pr4.fsf@gitster-ct.c.googlers.com>
404
+
405
+
406
+* dt/submodule-rm-with-stale-cache (2020-01-28) 1 commit
407
+ - git rm submodule: succeed if .gitmodules index stat info is zero
408
+
409
+ Running "git rm" on a submodule failed unnecessarily when
410
+ .gitmodules is only cache-dirty, which has been corrected.
411
412
Will merge to 'next'.
413
414
251
-* es/fetch-show-failed-submodules-atend (2020-01-17) 1 commit
252
- - fetch: emphasize failure during submodule fetch
415
+* en/fill-directory-exponential (2020-01-31) 6 commits
416
+ - t7063: blindly accept diffs
417
+ - dir: replace exponential algorithm with a linear one
418
+ - dir: refactor treat_directory to clarify control flow
419
+ - dir: fix confusion based on variable tense
420
+ - dir: fix broken comment
421
+ - dir: consolidate treat_path() and treat_one_path()
422
+ (this branch uses en/fill-directory-fixes-more.)
423
254
- A fetch that is told to recursively fetch updates in submodules
255
- inevitably produces reams of output, and it becomes hard to spot
256
- error messages. The command has been taught to enumerate
257
- submodules that had errors at the end of the operation.
424
+ The directory traversal code had redundant recursive calls which
425
+ made its performance characteristics exponential wrt the depth of
426
+ the tree, which was corrected.
427
+
428
+ Still RFC?
429
+ cf. <pull.700.v2.git.git.1580495486.gitgitgadget@gmail.com>
430
+
431
+
432
+* hw/doc-git-dir (2020-01-30) 1 commit
433
+ - git: update documentation for --git-dir
434
+
435
+ One effect of specifying where the GIT_DIR is (either with the
436
+ environment variable, or with the "git --git-dir=<where> cmd"
437
+ option) is to disable the repository discovery. This has been
438
+ placed a bit more stress in the documentation, as new users often
439
+ get confused.
440
441
Will merge to 'next'.
442
443
262
-* jk/asan-build-fix (2020-01-16) 1 commit
263
- - Makefile: use compat regex with SANITIZE=address
444
+* jb/parse-options-message-fix (2020-02-05) 1 commit
445
+ - parse-options: lose an unnecessary space in an error message
446
+
447
+ Error message fix.
448
+
449
+ Waiting for a response
450
+ cf. <xmqqv9ok6fa1.fsf@gitster-ct.c.googlers.com>
451
265
- Work around test breakages caused by custom regex engine used in
266
- libasan, when address sanitizer is used with more recent versions
267
- of gcc and clang.
452
+
453
+* jc/skip-prefix (2020-01-31) 1 commit
454
+ - C: use skip_prefix() to avoid hardcoded string length
455
+
456
+ Code simplification.
457
458
Will merge to 'next'.
459
460
272
-* jk/test-fixes (2020-01-16) 2 commits
273
- - t7800: don't rely on reuse_worktree_file()
274
- - t4018: drop "debugging" cat from hunk-header tests
461
+* jh/notes-fanout-fix (2020-02-04) 2 commits
462
+ - notes.c: fix off-by-one error when decreasing notes fanout
463
+ - t3305: check notes fanout more carefully and robustly
464
276
- Test fixes.
465
+ The code to automatically shrink the fan-out in the notes tree had
466
+ an off-by-one bug, which has been killed.
467
468
Will merge to 'next'.
469
470
281
-* js/builtin-add-i-cmds (2020-01-16) 2 commits
282
- - built-in add -i: accept open-ended ranges again
283
- - built-in add -i: do not try to `patch`/`diff` an empty list of files
471
+* jk/alloc-cleanups (2020-02-04) 4 commits
472
+ - tree-walk.c: break circular dependency with unpack-trees
473
+ - traverse_trees(): use stack array for name entries
474
+ - walker_fetch(): avoid raw array length computation
475
+ - normalize_path_copy(): document "dst" size expectations
476
285
- Minor bugfixes to "git add -i" that has recently been rewritten in C.
477
+ Misc code clean-ups.
478
479
Will merge to 'next'.
480
481
290
-* rt/submodule-i18n (2020-01-16) 1 commit
291
- - submodule.c: mark more strings for translation
482
+* jk/clang-sanitizer-fixes (2020-01-28) 5 commits
483
+ - obstack: avoid computing offsets from NULL pointer
484
+ - xdiff: avoid computing non-zero offset from NULL pointer
485
+ - avoid computing zero offsets from NULL pointer
486
+ - merge-recursive: use subtraction to flip stage
487
+ - merge-recursive: silence -Wxor-used-as-pow warning
488
293
- Comments update.
489
+ C pedantry ;-) fix.
490
491
Will merge to 'next'.
492
493
298
-* am/pathspec-f-f-more (2020-01-21) 8 commits
299
- - stash push: support the --pathspec-from-file option
300
- - stash: eliminate crude option parsing
301
- - doc: stash: synchronize <pathspec> description
302
- - doc: stash: document more options
303
- - doc: stash: split options from description (2)
304
- - doc: stash: split options from description (1)
305
- - rm: support the --pathspec-from-file option
306
- - doc: rm: synchronize <pathspec> description
494
+* jk/diff-honor-wserrhighlight-in-plumbing (2020-01-31) 1 commit
495
+ - diff: move diff.wsErrorHighlight to "basic" config
496
308
- "git rm" and "git stash" learns the new "--pathspec-from-file"
309
- option.
497
+ The diff-* plumbing family of subcommands now pay attention to the
498
+ diff.wsErrorHighlight configuration, which has been ignored before;
499
+ this allows "git add -p" to also show the whitespace problems to
500
+ the end user.
501
502
+ Will merge to 'next'.
503
312
-* bc/actualmente (2020-01-21) 1 commit
313
- - docs: use "currently" for the present time
504
315
- Doc grammo fix.
505
+* jk/escaped-wildcard-dwim (2020-01-27) 1 commit
506
+ - verify_filename(): handle backslashes in "wildcards are pathspecs" rule
507
+
508
+ Disambiguation logic to tell revisions and pathspec apart has been
509
+ tweaked so that backslash-escaped glob special characters do not
510
+ count in the "wildcards are pathspec" rule.
511
512
Will merge to 'next'.
513
514
320
-* bc/author-committer-doc (2020-01-22) 3 commits
321
- - doc: provide guidance on user.name format
322
- - docs: expand on possible and recommended user config options
323
- - doc: move author and committer information to git-commit(1)
515
+* jk/get-oid-error-message-i18n (2020-01-30) 3 commits
516
+ - sha1-name: mark get_oid() error messages for translation
517
+ - t1506: drop space after redirection operator
518
+ - t1400: avoid "test" string comparisons
519
325
- Clarify documentation on committer/author identities.
520
+ A low-level API function get_oid(), that accepts various ways to
521
+ name an object, used to issue end-user facing error messages
522
+ without l10n, which has been updated to be translatable.
523
524
Will merge to 'next'.
525
526
330
-* bc/misconception-doc (2020-01-22) 2 commits
331
- - docs: mention when increasing http.postBuffer is valuable
332
- - doc: dissuade users from trying to ignore tracked files
527
+* jk/index-pack-dupfix (2020-02-04) 1 commit
528
+ - index-pack: downgrade twice-resolved REF_DELTA to die()
529
334
- Doc updates.
530
+ The index-pack code now diagnoses a bad input packstream that
531
+ records the same object twice when it is used as delta base; the
532
+ code used to declare a software bug when encountering such an
533
+ input, but it is an input error.
534
535
Will merge to 'next'.
536
537
339
-* ds/refmap-doc (2020-01-21) 1 commit
340
- - fetch: document and test --refmap=""
538
+* jk/push-default-doc (2020-01-29) 1 commit
539
+ - doc: drop "explicitly given" from push.default description
540
342
- "git fetch --refmap=" option has got a better documentation.
541
+ Doc update.
542
543
Will merge to 'next'.
544
545
347
-* js/rebase-i-with-colliding-hash (2020-01-21) 3 commits
348
- - rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
349
- - rebase -i: re-fix short SHA-1 collision
350
- - parse_insn_line(): improve error message when parsing failed
546
+* jt/connectivity-check-optim-in-partial-clone (2020-01-30) 2 commits
547
+ - fetch: forgo full connectivity check if --filter
548
+ - connected: verify promisor-ness of partial clone
549
550
+ Unneeded connectivity check is now disabled in a partial clone when
551
+ fetching into it.
552
353
-* lh/bool-to-type-bool (2020-01-21) 1 commit
354
- - templates: fix deprecated type option `--bool`
553
+ Will merge to 'next'.
554
356
- Replace "git config --bool" calls with "git config --type=bool" in
357
- sample templates.
555
+
556
+* jt/t5616-robustify (2020-01-27) 1 commit
557
+ - t5616: make robust to delta base change
558
+
559
+ Futureproofing a test not to depend on the current implementation
560
+ detail.
561
562
Will merge to 'next'.
563
564
362
-* pb/recurse-submodule-in-worktree-fix (2020-01-22) 4 commits
363
- - submodule.c: use get_git_dir() instead of get_git_common_dir()
364
- - t2405: clarify test descriptions and simplify test
365
- - t2405: use git -C and test_commit -C instead of subshells
366
- - t7410: rename to t2405-worktree-submodule.sh
565
+* km/submodule-doc-use-sm-path (2020-01-31) 1 commit
566
+ - submodule foreach: replace $path with $sm_path in example
567
368
- The "--recurse-submodules" option of various subcommands did not
369
- work well when run in an alternate worktree, which has been
370
- corrected.
568
+ Docfix.
569
570
Will merge to 'next'.
571
572
375
-* ss/t6025-modernize (2020-01-21) 2 commits
376
- - t6025: use helpers to replace test -f <path>
377
- - t6025: modernize style
573
+* ld/p4-cleanup-processes (2020-01-30) 7 commits
574
+ - git-p4: avoid leak of file handle when cloning
575
+ - git-p4: check for access to remote host earlier
576
+ - git-p4: cleanup better on error exit
577
+ - git-p4: create helper function importRevisions()
578
+ - git-p4: disable some pylint warnings, to get pylint output to something manageable
579
+ - git-p4: add P4CommandException to report errors talking to Perforce
580
+ - git-p4: make closeStreams() idempotent
581
379
- Test style updates.
582
+ p4 updates.
583
+
584
+ Will merge to 'next'.
585
+
586
+
587
+* ma/filter-branch-doc-caret (2020-02-04) 1 commit
588
+ - git-filter-branch.txt: wrap "maths" notation in backticks
589
+
590
+ Doc mark-up updates.
591
592
Will merge to 'next'.
593
383
---------------------------------------------------
384
-[Stalled]
594
386
-* ag/edit-todo-drop-check (2019-12-06) 2 commits
387
- - rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
388
- - sequencer: move check_todo_list_from_file() to rebase-interactive.c
595
+* ms/doc-bundle-format (2020-02-04) 1 commit
596
+ - doc: describe Git bundle format
597
+
598
+ Technical details of the bundle format has been documented.
599
+
600
+ Will merge to 'next'?
601
+ cf. <xmqqtv4b8bus.fsf@gitster-ct.c.googlers.com>
602
+
603
+
604
+* mt/use-passed-repo-more-in-funcs (2020-01-31) 7 commits
605
+ - sha1-file: allow check_object_signature() to handle any repo
606
+ - sha1-file: pass git_hash_algo to hash_object_file()
607
+ - sha1-file: pass git_hash_algo to write_object_file_prepare()
608
+ - streaming: allow open_istream() to handle any repo
609
+ - pack-check: use given repo's hash_algo at verify_packfile()
610
+ - cache-tree: use given repo's hash_algo at verify_one()
611
+ - diff: make diff_populate_filespec() honor its repo argument
612
+
613
+ Some codepaths were given a repository instance as a parameter to
614
+ work in the repository, but passed the_repository instance to its
615
+ callees, which has been cleaned up (somewhat).
616
+
617
+ Will merge to 'next'.
618
+
619
+
620
+* pb/do-not-recurse-grep-no-index (2020-01-30) 1 commit
621
+ - grep: ignore --recurse-submodules if --no-index is given
622
+
623
+ "git grep --no-index" should not get affected by the contents of
624
+ the .gitmodules file but when "--recurse-submodules" is given or
625
+ the "submodule.recurse" variable is set, it did. Now these
626
+ settings are ignored in the "--no-index" mode.
627
+
628
+ Will merge to 'next'.
629
+
630
+
631
+* rs/name-rev-memsave (2020-02-05) 11 commits
632
+ - name-rev: sort tip names before applying
633
+ - name-rev: release unused name strings
634
+ - name-rev: generate name strings only if they are better
635
+ - name-rev: pre-size buffer in get_parent_name()
636
+ - name-rev: factor out get_parent_name()
637
+ - name-rev: put struct rev_name into commit slab
638
+ - name-rev: don't _peek() in create_or_update_name()
639
+ - name-rev: don't leak path copy in name_ref()
640
+ - name-rev: respect const qualifier
641
+ - name-rev: remove unused typedef
642
+ - name-rev: rewrite create_or_update_name()
643
+
644
+ Memory footprint and performance of "git name-rev" has been
645
+ improved.
646
+
647
+
648
+* tb/commit-graph-object-dir (2020-02-04) 5 commits
649
+ - commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
650
+ - commit-graph.c: remove path normalization, comparison
651
+ - commit-graph.h: store object directory in 'struct commit_graph'
652
+ - commit-graph.h: store an odb in 'struct write_commit_graph_context'
653
+ - t5318: don't pass non-object directory to '--object-dir'
654
+ (this branch is used by tb/commit-graph-split-merge.)
655
+
656
+ The code to compute the commit-graph has been taught to use a more
657
+ robust way to tell if two object directories refer to the same
658
+ thing.
659
+
660
+ Will merge to 'next'.
661
+
662
+
663
+* tb/commit-graph-split-merge (2020-02-05) 3 commits
664
+ - builtin/commit-graph.c: support '--input=none'
665
+ - builtin/commit-graph.c: introduce '--input=<source>'
666
+ - builtin/commit-graph.c: support '--split[=<strategy>]'
667
+ (this branch uses tb/commit-graph-object-dir.)
668
+
669
+ The code to write out the commit-graph has been taught a few
670
+ options to control if the resulting graph chains should be merged
671
+ or a single new incremental graph is created.
672
+
673
+ Will merge to 'next'?
674
+
675
+
676
+--------------------------------------------------
677
+[Stalled]
678
+
679
+* jc/format-patch-delay-message-id (2019-04-05) 1 commit
680
+ - format-patch: move message-id and related headers to the end
681
+
682
+ The location "git format-patch --thread" adds the Message-Id:
683
+ header in the series of header fields has been moved down, which
684
+ may help working around a suspected bug in GMail MSA, reported at
685
+ <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>
686
+
687
+ Waiting for feedback to see if it truly helps.
688
+ Needs tests.
689
+
690
+
691
+* pw/advise-rebase-skip (2019-12-06) 9 commits
692
+ - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
693
+ - rebase: fix advice when a fixup creates an empty commit
694
+ - commit: give correct advice for empty commit during a rebase
695
+ - commit: encapsulate determine_whence() for sequencer
696
+ - commit: use enum value for multiple cherry-picks
697
+ - sequencer: write CHERRY_PICK_HEAD for reword and edit
698
+ - cherry-pick: check commit error messages
699
+ - cherry-pick: add test for `--skip` advice in `git commit`
700
+ - t3404: use test_cmp_rev
701
390
- Allow the rebase.missingCommitsCheck configuration to kick in when
391
- "rebase --edit-todo" and "rebase --continue" restarts the procedure.
702
+ The mechanism to prevent "git commit" from making an empty commit
703
+ or amending during an interrupted cherry-pick was broken during the
704
+ rewrite of "git rebase" in C, which has been corrected.
705
393
- Broken.
394
- cf. <64aa4049-ee35-df4c-1e6c-80707f4f9070@gmail.com>
706
+ What's the status of this one?
707
+ The tip two are still RFC.
708
709
710
* es/pathspec-f-f-grep (2020-01-13) 1 commit
398
- - grep: support the --pathspec-from-file option
711
+ . grep: support the --pathspec-from-file option
712
713
"git grep" learned the "--pathspec-from-file" command line
714
option.
@@ -460,36 +773,24 @@ of the repositories listed at
773
774
775
* jn/unknown-index-extensions (2018-11-21) 2 commits
463
- - index: offer advice for unknown index extensions
464
- - index: do not warn about unrecognized extensions
776
+ . index: offer advice for unknown index extensions
777
+ . index: do not warn about unrecognized extensions
778
779
A bit too alarming warning given when unknown index extensions
780
exist is getting revamped.
781
469
- Expecting a reroll.
470
-
471
-
472
-* jc/format-patch-delay-message-id (2019-04-05) 1 commit
473
- - format-patch: move message-id and related headers to the end
474
-
475
- The location "git format-patch --thread" adds the Message-Id:
476
- header in the series of header fields has been moved down, which
477
- may help working around a suspected bug in GMail MSA, reported at
478
- <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>
479
-
480
- Waiting for feedback to see if it truly helps.
481
- Needs tests.
782
+ Getting tired of waiting for a reroll. Will discard.
783
784
785
* js/protocol-advertise-multi (2018-12-28) 1 commit
485
- - protocol: advertise multiple supported versions
786
+ . protocol: advertise multiple supported versions
787
788
The transport layer has been updated so that the protocol version
789
used can be negotiated between the parties, by the initiator
790
listing the protocol versions it is willing to talk, and the other
791
side choosing from one of them.
792
492
- Expecting a reroll.
793
+ Getting tired of waiting for a reroll. Will discard.
794
cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>
795
796
@@ -503,6 +804,138 @@ of the repositories listed at
804
--------------------------------------------------
805
[Cooking]
806
807
+* ag/edit-todo-drop-check (2020-01-28) 2 commits
808
+ - rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
809
+ - sequencer: move check_todo_list_from_file() to rebase-interactive.c
810
+ (this branch uses js/rebase-i-with-colliding-hash.)
811
+
812
+ Allow the rebase.missingCommitsCheck configuration to kick in when
813
+ "rebase --edit-todo" and "rebase --continue" restarts the procedure.
814
+
815
+ Will merge to 'next'.
816
+
817
+
818
+* am/checkout-file-and-ref-ref-ambiguity (2020-01-07) 2 commits
819
+ (merged to 'next' on 2020-01-27 at daf1dadc78)
820
+ + checkout: don't revert file on ambiguous tracking branches
821
+ + parse_branchname_arg(): extract part as new function
822
+
823
+ "git checkout X" did not correctly fail when X is not a local
824
+ branch but could name more than one remote-tracking branches
825
+ (i.e. to be dwimmed as the starting point to create a corresponding
826
+ local branch), which has been corrected.
827
+
828
+ Will merge to 'master'.
829
+
830
+
831
+* kw/fsmonitor-watchman-racefix (2020-01-23) 4 commits
832
+ - fsmonitor: update documentation for hook version and watchman hooks
833
+ - fsmonitor: add fsmonitor hook scripts for version 2
834
+ - fsmonitor: handle version 2 of the hooks that will use opaque token
835
+ - fsmonitor: change last update timestamp on the index_state to opaque token
836
+
837
+ A new version of fsmonitor-watchman hook has been introduced, to
838
+ avoid races.
839
+
840
+ Will merge to 'next'.
841
+
842
+
843
+* hw/advice-add-nothing (2020-01-15) 1 commit
844
+ (merged to 'next' on 2020-01-22 at 3fe4494fa6)
845
+ + add: use advise function to display hints
846
+
847
+ Two help messages given when "git add" notices the user gave it
848
+ nothing to add have been updated to use advise() API.
849
+
850
+ Expecting a follow-up
851
+ to perform <pull.508.v3.git.1580346702203.gitgitgadget@gmail.com>
852
+ incrementally.
853
+
854
+
855
+* km/submodule-add-errmsg (2020-01-15) 1 commit
856
+ (merged to 'next' on 2020-01-27 at 0ff8378907)
857
+ + submodule add: show 'add --dry-run' stderr when aborting
858
+
859
+ Improve error message generation for "git submodule add".
860
+
861
+ Will merge to 'master'.
862
+
863
+
864
+* en/fill-directory-fixes-more (2020-01-16) 4 commits
865
+ (merged to 'next' on 2020-01-27 at 9a27e1495b)
866
+ + dir: point treat_leading_path() warning to the right place
867
+ + dir: restructure in a way to avoid passing around a struct dirent
868
+ + dir: treat_leading_path() and read_directory_recursive(), round 2
869
+ + clean: demonstrate a bug with pathspecs
870
+ (this branch is used by en/fill-directory-exponential.)
871
+
872
+ Corner case bugs in "git clean" that stems from a (necessarily for
873
+ performance reasons) awkward calling convention in the directory
874
+ enumeration API has been corrected.
875
+
876
+ Will merge to 'master'.
877
+
878
+
879
+* es/fetch-show-failed-submodules-atend (2020-01-17) 1 commit
880
+ (merged to 'next' on 2020-01-27 at 7b41163881)
881
+ + fetch: emphasize failure during submodule fetch
882
+
883
+ A fetch that is told to recursively fetch updates in submodules
884
+ inevitably produces reams of output, and it becomes hard to spot
885
+ error messages. The command has been taught to enumerate
886
+ submodules that had errors at the end of the operation.
887
+
888
+ Will merge to 'master'.
889
+
890
+
891
+* am/pathspec-f-f-more (2020-01-21) 8 commits
892
+ - stash push: support the --pathspec-from-file option
893
+ - stash: eliminate crude option parsing
894
+ - doc: stash: synchronize <pathspec> description
895
+ - doc: stash: document more options
896
+ - doc: stash: split options from description (2)
897
+ - doc: stash: split options from description (1)
898
+ - rm: support the --pathspec-from-file option
899
+ - doc: rm: synchronize <pathspec> description
900
+
901
+ "git rm" and "git stash" learns the new "--pathspec-from-file"
902
+ option.
903
+
904
+ Waiting for review response.
905
+ cf. <xmqqftg8a9fp.fsf@gitster-ct.c.googlers.com>
906
+ cf. <xmqqblqwa7d3.fsf@gitster-ct.c.googlers.com>
907
+
908
+
909
+* js/rebase-i-with-colliding-hash (2020-01-23) 3 commits
910
+ - rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
911
+ - rebase -i: re-fix short SHA-1 collision
912
+ - parse_insn_line(): improve error message when parsing failed
913
+ (this branch is used by ag/edit-todo-drop-check.)
914
+
915
+ "git rebase -i" identifies existing commits in its todo file with
916
+ their abbreviated object name, which could become ambigous as it
917
+ goes to create new commits, and has a mechanism to avoid ambiguity
918
+ in the main part of its execution. A few other cases however were
919
+ not covered by the protection against ambiguity, which has been
920
+ corrected.
921
+
922
+ Will merge to 'next'.
923
+
924
+
925
+* pb/recurse-submodule-in-worktree-fix (2020-01-22) 4 commits
926
+ (merged to 'next' on 2020-01-27 at e4cb1e376a)
927
+ + submodule.c: use get_git_dir() instead of get_git_common_dir()
928
+ + t2405: clarify test descriptions and simplify test
929
+ + t2405: use git -C and test_commit -C instead of subshells
930
+ + t7410: rename to t2405-worktree-submodule.sh
931
+
932
+ The "--recurse-submodules" option of various subcommands did not
933
+ work well when run in an alternate worktree, which has been
934
+ corrected.
935
+
936
+ Will merge to 'master'.
937
+
938
+
939
* mt/threaded-grep-in-object-store (2020-01-17) 12 commits
940
- grep: use no. of cores as the default no. of threads
941
- grep: move driver pre-load out of critical section
@@ -521,13 +954,6 @@ of the repositories listed at
954
(as opposed to files in the working tree) as accesses to the object
955
layer is not thread-safe. This limitation is getting lifted.
956
524
-
525
-* hi/indent-text-with-tabs-in-editorconfig (2020-01-06) 1 commit
526
- - editorconfig: indent text files with tabs
527
-
528
- Tell .editorconfig that in this project, *.txt files are indented
529
- with tabs.
530
-
957
Will merge to 'next'.
958
959
@@ -537,15 +963,10 @@ of the repositories listed at
963
Warn programmers about pretend_object_file() that allows the code
964
to tentatively use in-core objects.
965
540
-
541
-* en/unpack-trees-check-updates-simplify (2020-01-04) 1 commit
542
- - unpack-trees: exit check_updates() early if updates are not wanted
543
-
544
- Code simplification.
545
-
966
Will merge to 'next'.
967
968
969
+
970
* dl/merge-autostash (2020-01-13) 17 commits
971
- pull: pass --autostash to merge
972
- t5520: make test_pull_autostash() accept expect_parent_num
@@ -567,11 +988,11 @@ of the repositories listed at
988
989
"git merge" learns the "--autostash" option.
990
570
- What's the status of this one? Are people happy with the shape of
571
- the code?
991
+ Expecting a reroll.
992
+ cf. <20200123042906.GA29009@generichostname>
993
994
574
-* dl/test-must-fail-fixes-2 (2020-01-07) 16 commits
995
+* dl/test-must-fail-fixes-2 (2020-01-27) 16 commits
996
- t4124: only mark git command with test_must_fail
997
- t3507: use test_path_is_missing()
998
- t3507: fix indentation
@@ -584,7 +1005,7 @@ of the repositories listed at
1005
- t2018: replace "sha" with "oid"
1006
- t2018: don't lose return code of git commands
1007
- t2018: teach do_checkout() to accept `!` arg
587
- - t2018: use test_expect_code for failing git commands
1008
+ - t2018: be more discerning when checking for expected exit codes
1009
- t2018: improve style of if-statement
1010
- t2018: add space between function name and ()
1011
- t2018: remove trailing space from test description
@@ -600,50 +1021,14 @@ of the repositories listed at
1021
- test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
1022
- config doc: protocol.version is not experimental
1023
- fetch test: use more robust test for filtered objects
603
- (this branch uses jn/test-lint-one-shot-export-to-shell-function.)
1024
1025
The transport protocol version 2 becomes the default one.
1026
1027
Will merge to 'next'.
1028
1029
610
-* am/test-pathspec-f-f-error-cases (2020-01-15) 1 commit
611
- - t: add tests for error conditions with --pathspec-from-file
612
-
613
- More tests.
614
-
615
- Will merge to 'next'.
616
-
617
-
618
-* jt/sha1-file-remove-oi-skip-cached (2020-01-02) 1 commit
619
- (merged to 'next' on 2020-01-15 at 4feaff54f3)
620
- + sha1-file: remove OBJECT_INFO_SKIP_CACHED
621
-
622
- Originally merged to 'next' on 2020-01-04
623
-
624
- has_object_file() said "no" given an object registered to the
625
- system via pretend_object_file(), making it inconsistent with
626
- read_object_file(), causing lazy fetch to attempt fetching an
627
- empty tree from promisor remotes.
628
-
629
- Will merge to 'master'.
630
-
631
-
632
-* hw/commit-advise-while-rejecting (2019-12-19) 1 commit
633
- (merged to 'next' on 2020-01-15 at 4f16e5a3b6)
634
- + commit: honor advice.statusHints when rejecting an empty commit
635
-
636
- Originally merged to 'next' on 2019-12-30
637
-
638
- "git commit" gives output similar to "git status" when there is
639
- nothing to commit, but without honoring the advise.statusHints
640
- configuration variable, which has been corrected.
641
-
642
- Will merge to 'master'.
643
-
644
-
1030
* yz/p4-py3 (2020-01-15) 14 commits
646
- - ci: also run linux-gcc pipeline with python3.5 environment
1031
+ . ci: also run linux-gcc pipeline with python3.5 environment
1032
- git-p4: use python3's input() everywhere
1033
- git-p4: simplify regex pattern generation for parsing diff-tree
1034
- git-p4: use dict.items() iteration for python3 compatibility
@@ -660,66 +1045,33 @@ of the repositories listed at
1045
1046
Update "git p4" to work with Python 3.
1047
663
- Will merge to 'next'.
664
-
665
-
666
-* hi/gpg-mintrustlevel (2020-01-15) 1 commit
667
- - gpg-interface: add minTrustLevel as a configuration option
668
-
669
- gpg.minTrustLevel configuration variable has been introduced to
670
- tell various signature verification codepaths the required minimum
671
- trust level.
672
-
673
- Will merge to 'next'.
674
-
675
-
676
-* sg/completion-worktree (2020-01-15) 6 commits
677
- - completion: list paths and refs for 'git worktree add'
678
- - completion: list existing working trees for 'git worktree' subcommands
679
- - completion: simplify completing 'git worktree' subcommands and options
680
- - completion: return the index of found word from __git_find_on_cmdline()
681
- - completion: clean up the __git_find_on_cmdline() helper function
682
- - t9902-completion: add tests for the __git_find_on_cmdline() helper
683
-
684
- The command line completion (in contrib/) learned to complete
685
- subcommands and arguments to "git worktree".
686
-
687
- Will merge to 'next'.
688
-
689
-
690
-* dl/credential-netrc (2019-12-20) 2 commits
691
- (merged to 'next' on 2020-01-15 at 768fa1c364)
692
- + contrib/credential/netrc: work outside a repo
693
- + contrib/credential/netrc: make PERL_PATH configurable
694
-
695
- Originally merged to 'next' on 2019-12-25
696
-
697
- Sample credential helper for using .netrc has been updated to work
698
- out of the box.
699
-
700
- Will merge to 'master'.
1048
+ Hold.
1049
+ The last step is too wasteful to run full tests twice.
1050
+ cf. <20200122235333.GA6837@szeder.dev>
1051
+ cf. <20200123175645.GF6837@szeder.dev>
1052
1053
1054
* dl/test-must-fail-fixes (2019-12-20) 15 commits
704
- - t1507: inline full_name()
705
- - t1507: run commands within test_expect_success
706
- - t1507: stop losing return codes of git commands
707
- - t1501: remove use of `test_might_fail cp`
708
- - t1409: use test_path_is_missing()
709
- - t1409: let sed open its own input file
710
- - t1307: reorder `nongit test_must_fail`
711
- - t1306: convert `test_might_fail rm` to `rm -f`
712
- - t0020: use ! check_packed_refs_marked
713
- - t0020: don't use `test_must_fail has_cr`
714
- - t0003: don't use `test_must_fail attr_check`
715
- - t0003: use test_must_be_empty()
716
- - t0003: use named parameters in attr_check()
717
- - t0000: replace test_must_fail with run_sub_test_lib_test_err()
718
- - t/lib-git-p4: use test_path_is_missing()
1055
+ (merged to 'next' on 2020-01-27 at ed382cd096)
1056
+ + t1507: inline full_name()
1057
+ + t1507: run commands within test_expect_success
1058
+ + t1507: stop losing return codes of git commands
1059
+ + t1501: remove use of `test_might_fail cp`
1060
+ + t1409: use test_path_is_missing()
1061
+ + t1409: let sed open its own input file
1062
+ + t1307: reorder `nongit test_must_fail`
1063
+ + t1306: convert `test_might_fail rm` to `rm -f`
1064
+ + t0020: use ! check_packed_refs_marked
1065
+ + t0020: don't use `test_must_fail has_cr`
1066
+ + t0003: don't use `test_must_fail attr_check`
1067
+ + t0003: use test_must_be_empty()
1068
+ + t0003: use named parameters in attr_check()
1069
+ + t0000: replace test_must_fail with run_sub_test_lib_test_err()
1070
+ + t/lib-git-p4: use test_path_is_missing()
1071
1072
Test clean-up.
1073
722
- Will merge to 'next'.
1074
+ Will merge to 'master'.
1075
1076
1077
* en/rebase-backend (2020-01-17) 19 commits
@@ -747,107 +1099,84 @@ of the repositories listed at
1099
while allowing "--am" option to go back to the traditional "am"
1100
backend.
1101
1102
+ Waiting for reviews and/or Acks.
1103
+ cf. <CABPp-BHONuRyt8VJqRuoCF2rGYZ5EhH9KJXQZ3NO69rYwA5J3g@mail.gmail.com>
1104
+
1105
1106
* bc/hash-independent-tests-part-7 (2020-01-15) 20 commits
752
- - t5604: make hash independent
753
- - t5601: switch into repository to hash object
754
- - t5562: use $ZERO_OID
755
- - t5540: make hash size independent
756
- - t5537: make hash size independent
757
- - t5530: compute results based on object length
758
- - t5512: abstract away SHA-1-specific constants
759
- - t5510: make hash size independent
760
- - t5504: make hash algorithm independent
761
- - t5324: make hash size independent
762
- - t5319: make test work with SHA-256
763
- - t5319: change invalid offset for SHA-256 compatibility
764
- - t5318: update for SHA-256
765
- - t4300: abstract away SHA-1-specific constants
766
- - t4204: make hash size independent
767
- - t4202: abstract away SHA-1-specific constants
768
- - t4200: make hash size independent
769
- - t4134: compute appropriate length constant
770
- - t4066: compute index line in diffs
771
- - t4054: make hash-size independent
1107
+ (merged to 'next' on 2020-01-27 at a519c8fae4)
1108
+ + t5604: make hash independent
1109
+ + t5601: switch into repository to hash object
1110
+ + t5562: use $ZERO_OID
1111
+ + t5540: make hash size independent
1112
+ + t5537: make hash size independent
1113
+ + t5530: compute results based on object length
1114
+ + t5512: abstract away SHA-1-specific constants
1115
+ + t5510: make hash size independent
1116
+ + t5504: make hash algorithm independent
1117
+ + t5324: make hash size independent
1118
+ + t5319: make test work with SHA-256
1119
+ + t5319: change invalid offset for SHA-256 compatibility
1120
+ + t5318: update for SHA-256
1121
+ + t4300: abstract away SHA-1-specific constants
1122
+ + t4204: make hash size independent
1123
+ + t4202: abstract away SHA-1-specific constants
1124
+ + t4200: make hash size independent
1125
+ + t4134: compute appropriate length constant
1126
+ + t4066: compute index line in diffs
1127
+ + t4054: make hash-size independent
1128
1129
Preparation of test scripts for the day when the object names will
1130
use SHA-256 continues.
1131
776
- Will merge to 'next'.
777
-
778
-
779
-* jn/test-lint-one-shot-export-to-shell-function (2020-01-15) 3 commits
780
- - fetch test: mark test of "skipping" haves as v0-only
781
- - t/check-non-portable-shell: detect "FOO= shell_func", too
782
- - fetch test: avoid use of "VAR= cmd" with a shell function
783
- (this branch is used by jn/promote-proto2-to-default.)
784
-
785
- The test-lint machinery knew to check "VAR=VAL shell_function"
786
- construct, but did not check "VAR= shell_funciton", which has been
787
- corrected.
788
-
789
- Will merge to 'next'.
1132
+ Will merge to 'master'.
1133
1134
1135
* js/add-p-leftover-bits (2020-01-15) 10 commits
793
- - ci: include the built-in `git add -i` in the `linux-gcc` job
794
- - built-in add -p: handle Escape sequences more efficiently
795
- - built-in add -p: handle Escape sequences in interactive.singlekey mode
796
- - built-in add -p: respect the `interactive.singlekey` config setting
797
- - terminal: add a new function to read a single keystroke
798
- - terminal: accommodate Git for Windows' default terminal
799
- - terminal: make the code of disable_echo() reusable
800
- - built-in add -p: handle diff.algorithm
801
- - built-in add -p: support interactive.diffFilter
802
- - t3701: adjust difffilter test
1136
+ (merged to 'next' on 2020-01-27 at ec5021a1bd)
1137
+ + ci: include the built-in `git add -i` in the `linux-gcc` job
1138
+ + built-in add -p: handle Escape sequences more efficiently
1139
+ + built-in add -p: handle Escape sequences in interactive.singlekey mode
1140
+ + built-in add -p: respect the `interactive.singlekey` config setting
1141
+ + terminal: add a new function to read a single keystroke
1142
+ + terminal: accommodate Git for Windows' default terminal
1143
+ + terminal: make the code of disable_echo() reusable
1144
+ + built-in add -p: handle diff.algorithm
1145
+ + built-in add -p: support interactive.diffFilter
1146
+ + t3701: adjust difffilter test
1147
(this branch uses js/patch-mode-in-others-in-c.)
1148
1149
The final leg of rewriting "add -i/-p" in C.
1150
807
- Will merge to 'next'.
808
-
809
-
810
-* pw/advise-rebase-skip (2019-12-06) 9 commits
811
- - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
812
- - rebase: fix advice when a fixup creates an empty commit
813
- - commit: give correct advice for empty commit during a rebase
814
- - commit: encapsulate determine_whence() for sequencer
815
- - commit: use enum value for multiple cherry-picks
816
- - sequencer: write CHERRY_PICK_HEAD for reword and edit
817
- - cherry-pick: check commit error messages
818
- - cherry-pick: add test for `--skip` advice in `git commit`
819
- - t3404: use test_cmp_rev
820
-
821
- The mechanism to prevent "git commit" from making an empty commit
822
- or amending during an interrupted cherry-pick was broken during the
823
- rewrite of "git rebase" in C, which has been corrected.
824
-
825
- What's the status of this one?
826
- The tip two are still RFC.
1151
+ Will merge to 'master'.
1152
1153
1154
* js/patch-mode-in-others-in-c (2019-12-21) 7 commits
830
- - commit --interactive: make it work with the built-in `add -i`
831
- - built-in add -p: implement the "worktree" patch modes
832
- - built-in add -p: implement the "checkout" patch modes
833
- - built-in stash: use the built-in `git add -p` if so configured
834
- - legacy stash -p: respect the add.interactive.usebuiltin setting
835
- - built-in add -p: implement the "stash" and "reset" patch modes
836
- - built-in add -p: prepare for patch modes other than "stage"
1155
+ (merged to 'next' on 2020-01-27 at 36f6756aae)
1156
+ + commit --interactive: make it work with the built-in `add -i`
1157
+ + built-in add -p: implement the "worktree" patch modes
1158
+ + built-in add -p: implement the "checkout" patch modes
1159
+ + built-in stash: use the built-in `git add -p` if so configured
1160
+ + legacy stash -p: respect the add.interactive.usebuiltin setting
1161
+ + built-in add -p: implement the "stash" and "reset" patch modes
1162
+ + built-in add -p: prepare for patch modes other than "stage"
1163
(this branch is used by js/add-p-leftover-bits.)
1164
1165
The effort to move "git-add--interactive" to C continues.
1166
841
- Will merge to 'next'.
1167
+ Will merge to 'master'.
1168
1169
844
-* jk/packfile-reuse-cleanup (2019-10-23) 9 commits
1170
+* jk/packfile-reuse-cleanup (2020-01-23) 12 commits
1171
+ - pack-bitmap: don't rely on bitmap_git->reuse_objects
1172
+ - pack-objects: add checks for duplicate objects
1173
- pack-objects: improve partial packfile reuse
1174
- builtin/pack-objects: introduce obj_is_packed()
1175
- pack-objects: introduce pack.allowPackReuse
1176
- csum-file: introduce hashfile_total()
1177
+ - pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
1178
+ - pack-bitmap: uninteresting oid can be outside bitmapped packfile
1179
- pack-bitmap: introduce bitmap_walk_contains()
850
- - pack-bitmap: don't rely on bitmap_git->reuse_objects
1180
- ewah/bitmap: introduce bitmap_word_alloc()
1181
- packfile: expose get_delta_base()
1182
- builtin/pack-objects: report reused packfile objects
@@ -855,26 +1184,4 @@ of the repositories listed at
1184
The way "git pack-objects" reuses objects stored in existing pack
1185
to generate its result has been improved.
1186
858
- Needs further clarification?
859
- cf. <20191115180319.113991-1-jonathantanmy@google.com>
860
-
861
---------------------------------------------------
862
-[Discarded]
863
-
864
-* js/advise-rebase-skip (2019-10-23) 3 commits
865
- . commit: give correct advice for empty commit during a rebase
866
- . sequencer: export the function to get the path of `.git/rebase-merge/`
867
- . cherry-pick: add test for `--skip` advice in `git commit`
868
-
869
- The logic used in "git commit" to give hints and errors depending
870
- on what operation was in progress learned to distinguish rebase and
871
- cherry-pick better.
872
-
873
- Superseded by pw/advise-rebase-skip
874
-
875
-
876
-* bk/p4-exception-cleanup (2019-12-16) 2 commits
877
- . git-p4: failure because of RCS keywords should show help
878
- . git-p4: wrap patchRCSKeywords test to revert changes on failure
879
-
880
- Discarded for now without prejudice.
1187
+ Will merge to 'next'?