What's cooking (2019/03 #02)
Junio C Hamano committed
Mar 7, 2019 at 17:31 UTC
ee6d8aa69d8194350f1500da2bd68a72edd02ccd
1 file changed
+560
-479
whats-cooking.txt
+560
-479
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Mar 2019, #01; Wed, 6)
4
-X-master-at: 36eb1cb9cfe327583128a4b0abdf9516c2ca815b
5
-X-next-at: 471c308f928be87428876934301e2b25cb242d19
3
+Subject: What's cooking in git.git (Mar 2019, #02; Thu, 7)
4
+X-master-at: 6e0cc6776106079ed4efa0cc9abace4107657abf
5
+X-next-at: 541d9dca55dd03b320a37ba2a509dab20ca41c98
6
7
-What's cooking in git.git (Mar 2019, #01; Wed, 6)
7
+What's cooking in git.git (Mar 2019, #02; Thu, 7)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +12,12 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-The maintenance track will be updated to preprare for 2.21.1 soonish,
16
-to address breakages with certain versions of msgfmt in 2.21.0; the
17
-tip of 'next' will also be updated at around the same time.
15
+The maintenance track has been updated to preprare for 2.21.1.
16
+Currently it only has the l10n updates (partly to unbreak builds
17
+with certain versions of msgfmt in 2.21.0. The tip of 'next' has
18
+not been rewound yet. This is a good time to fix a topic in 'next'
19
+that has known "oops that was wrong" at the source, instead of
20
+piling patches on top.
21
22
You can find the changes described here in the integration branches
23
of the repositories listed at
@@ -22,161 +25,392 @@ of the repositories listed at
25
http://git-blame.blogspot.com/p/git-public-repositories.html
26
27
--------------------------------------------------
25
-[New Topics]
28
+[Graduated to "master"]
29
27
-* jk/bisect-final-output (2019-03-01) 3 commits
28
- - bisect: make diff-tree output prettier
29
- - bisect: fix internal diff-tree config loading
30
- - bisect: use string arguments to feed internal diff-tree
30
+* ab/receive-pack-use-after-free-fix (2019-02-20) 1 commit
31
+ (merged to 'next' on 2019-02-23 at 3f41dfe375)
32
+ + receive-pack: fix use-after-free bug
33
32
- The final report from "git bisect" used to show the suspected
33
- culprit using a raw "diff-tree", with which there is no output for
34
- a merge commit. This has been updated to use a more modern and
35
- human readable output that still is concise enough.
34
+ Memfix.
35
37
- Will merge to 'next'.
36
37
+* aw/pretty-trailers (2019-01-29) 7 commits
38
+ (merged to 'next' on 2019-02-06 at b7e5437702)
39
+ + pretty: add support for separator option in %(trailers)
40
+ + strbuf: separate callback for strbuf_expand:ing literals
41
+ + pretty: add support for "valueonly" option in %(trailers)
42
+ + pretty: allow showing specific trailers
43
+ + pretty: single return path in %(trailers) handling
44
+ + pretty: allow %(trailers) options with explicit value
45
+ + doc: group pretty-format.txt placeholders descriptions
46
40
-* jk/fsck-doc (2019-03-05) 2 commits
41
- - fsck: always compute USED flags for unreachable objects
42
- - doc/fsck: clarify --connectivity-only behavior
47
+ The %(trailers) formatter in "git log --format=..." now allows to
48
+ optionally pick trailers selectively by keyword, show only values,
49
+ etc.
50
44
- "git fsck --connectivity-only" omits computation necessary to sift
45
- the objects that are not reachable from any of the refs into
46
- unreachable and dangling. This is now documented, and also the
47
- computation is done in order to show the dangling objects when
48
- requested (which is done by default, but can be overridden with
49
- the "--no-dangling" option).
51
51
- Will merge to 'next'.
52
+* dl/complete-submodule-absorbgitdirs (2019-02-06) 1 commit
53
+ (merged to 'next' on 2019-02-06 at c4e0cd535a)
54
+ + completion: complete git submodule absorbgitdirs
55
56
+ Command-line completion (in contrib/) learned to tab-complete the
57
+ "git submodule absorbgitdirs" subcommand.
58
54
-* jk/no-sigpipe-during-network-transport (2019-03-05) 2 commits
55
- - fetch: ignore SIGPIPE during network operation
56
- - fetch: avoid calling write_or_die()
59
58
- On platforms where "git fetch" is killed with SIGPIPE (e.g. OSX),
59
- the upload-pack that runs on the other end that hangs up after
60
- detecting an error could cause "git fetch" to die with a signal,
61
- which led to a flakey test. "git fetch" now ignores SIGPIPE during
62
- the network portion of its operation (this is not a problem as we
63
- check the return status from our write(2)s).
60
+* dl/doc-submodule-wo-subcommand (2019-02-15) 1 commit
61
+ (merged to 'next' on 2019-02-23 at 2f1c1428f1)
62
+ + submodule: document default behavior
63
65
- Will merge to 'next'.
64
+ Doc update.
65
66
68
-* jk/virtual-objects-do-exist (2019-03-05) 1 commit
69
- - rev-list: allow cached objects in existence check
67
+* du/branch-show-current (2018-10-26) 1 commit
68
+ (merged to 'next' on 2019-02-08 at e662ed4aee)
69
+ + branch: introduce --show-current display option
70
71
- A recent update broke "is this object available to us?" check for
72
- well-known objects like an empty tree (which should yield "yes",
73
- even when there is no on-disk object for an empty tree), which has
74
- been corrected.
71
+ "git branch" learned a new subcommand "--show-current".
72
76
- Will merge to 'next'.
73
74
+* en/combined-all-paths (2019-02-07) 1 commit
75
+ (merged to 'next' on 2019-02-08 at 7057f38d6e)
76
+ + log,diff-tree: add --combined-all-paths option
77
+
78
+ Output from "diff --cc" did not show the original paths when the
79
+ merge involved renames. A new option adds the paths in the
80
+ original trees to the output.
81
+
82
+
83
+* en/merge-options-doc (2019-02-21) 1 commit
84
+ (merged to 'next' on 2019-02-23 at 2eb5263dab)
85
+ + merge-options.txt: correct wording of --no-commit option
86
+
87
+ Doc update.
88
+
89
+
90
+* jc/test-yes-doc (2019-02-11) 1 commit
91
+ (merged to 'next' on 2019-02-13 at cffac01759)
92
+ + test: caution on our version of 'yes'
93
+
94
+ Test doc update.
95
+
96
+
97
+* jh/trace2 (2019-02-22) 15 commits
98
+ (merged to 'next' on 2019-02-22 at 4c84c621fe)
99
+ + trace2: add for_each macros to clang-format
100
+ + trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
101
+ + trace2:data: add subverb for rebase
102
+ + trace2:data: add subverb to reset command
103
+ + trace2:data: add subverb to checkout command
104
+ + trace2:data: pack-objects: add trace2 regions
105
+ + trace2:data: add trace2 instrumentation to index read/write
106
+ + trace2:data: add trace2 hook classification
107
+ + trace2:data: add trace2 transport child classification
108
+ + trace2:data: add trace2 sub-process classification
109
+ + trace2:data: add editor/pager child classification
110
+ + trace2:data: add trace2 regions to wt-status
111
+ + trace2: collect Windows-specific process information
112
+ + trace2: create new combined trace facility
113
+ + trace2: Documentation/technical/api-trace2.txt
114
+
115
+ A more structured way to obtain execution trace has been added.
116
+
117
+
118
+* jk/diff-no-index-initialize (2019-02-24) 1 commit
119
+ (merged to 'next' on 2019-02-24 at f37a814eb0)
120
+ + diff: reuse diff setup for --no-index case
121
+
122
+ "git diff --no-index" may still want to access Git goodies like
123
+ --ext-diff and --textconv, but so far these have been ignored,
124
+ which has been corrected.
125
+
126
+
127
+* jk/prune-optim (2019-02-14) 4 commits
128
+ (merged to 'next' on 2019-02-23 at 7d03afc1c2)
129
+ + t5304: rename "sha1" variables to "oid"
130
+ + prune: check SEEN flag for reachability
131
+ + prune: use bitmaps for reachability traversal
132
+ + prune: lazily perform reachability traversal
133
+
134
+ "git prune" has been taught to take advantage of reachability
135
+ bitmap when able.
136
+
137
+
138
+* jk/unused-params (2019-02-14) 10 commits
139
+ (merged to 'next' on 2019-02-23 at 9b715907a1)
140
+ + ref-filter: drop unused "sz" parameters
141
+ + ref-filter: drop unused "obj" parameters
142
+ + ref-filter: drop unused buf/sz pairs
143
+ + files-backend: drop refs parameter from split_symref_update()
144
+ + pack-objects: drop unused parameter from oe_map_new_pack()
145
+ + merge-recursive: drop several unused parameters
146
+ + diff: drop complete_rewrite parameter from run_external_diff()
147
+ + diff: drop unused emit data parameter from sane_truncate_line()
148
+ + diff: drop unused color reset parameters
149
+ + diff: drop options parameter from diffcore_fix_diff_index()
150
+
151
+ Code clean-up.
152
+
153
+
154
+* js/doc-symref-in-proto-v1 (2019-02-21) 1 commit
155
+ (merged to 'next' on 2019-02-21 at c7ca3bb974)
156
+ + protocol-capabilities.txt: document symref
157
+
158
+ Doc update.
159
+
160
+
161
+* jt/http-auth-proto-v2-fix (2019-03-03) 5 commits
162
+ (merged to 'next' on 2019-03-03 at d0fdc53f3a)
163
+ + remote-curl: use post_rpc() for protocol v2 also
164
+ + remote-curl: refactor reading into rpc_state's buf
165
+ + remote-curl: reduce scope of rpc_state.result
166
+ + remote-curl: reduce scope of rpc_state.stdin_preamble
167
+ + remote-curl: reduce scope of rpc_state.argv
168
+
169
+ Unify RPC code for smart http in protocol v0/v1 and v2, which fixes
170
+ a bug in the latter (lack of authentication retry) and generally
171
+ improves the code base.
172
+
173
+
174
+* nd/completion-more-parameters (2019-02-20) 1 commit
175
+ (merged to 'next' on 2019-02-23 at 23133710f7)
176
+ + completion: add more parameter value completion
177
+
178
+ The command line completion (in contrib/) has been taught to
179
+ complete more subcommand parameters.
180
+
181
+
182
+* nd/diff-parseopt (2019-01-27) 14 commits
183
+ (merged to 'next' on 2019-02-05 at 7c4b79aa79)
184
+ + diff.c: convert --raw
185
+ + diff.c: convert -W|--[no-]function-context
186
+ + diff.c: convert -U|--unified
187
+ + diff.c: convert -u|-p|--patch
188
+ + diff.c: prepare to use parse_options() for parsing
189
+ + diff.h: avoid bit fields in struct diff_flags
190
+ + diff.h: keep forward struct declarations sorted
191
+ + parse-options: allow ll_callback with OPTION_CALLBACK
192
+ + parse-options: avoid magic return codes
193
+ + parse-options: stop abusing 'callback' for lowlevel callbacks
194
+ + parse-options: add OPT_BITOP()
195
+ + parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
196
+ + parse-options: add one-shot mode
197
+ + parse-options.h: remove extern on function prototypes
198
+ (this branch is used by nd/diff-parseopt-2.)
199
+
200
+ The diff machinery, one of the oldest parts of the system, which
201
+ long predates the parse-options API, uses fairly long and complex
202
+ handcrafted option parser. This is being rewritten to use the
203
+ parse-options API.
204
+
205
+
206
+* nd/diff-parseopt-2 (2019-02-21) 21 commits
207
+ (merged to 'next' on 2019-02-23 at 6f11d0af54)
208
+ + diff-parseopt: convert --ignore-some-changes
209
+ + diff-parseopt: convert --[no-]minimal
210
+ + diff-parseopt: convert --relative
211
+ + diff-parseopt: convert --no-renames|--[no--rename-empty
212
+ + diff-parseopt: convert --find-copies-harder
213
+ + diff-parseopt: convert -C|--find-copies
214
+ + diff-parseopt: convert -D|--irreversible-delete
215
+ + diff-parseopt: convert -M|--find-renames
216
+ + diff-parseopt: convert -B|--break-rewrites
217
+ + diff-parseopt: convert --output-*
218
+ + diff-parseopt: convert --[no-]compact-summary
219
+ + diff-parseopt: convert --stat*
220
+ + diff-parseopt: convert -s|--no-patch
221
+ + diff-parseopt: convert --name-status
222
+ + diff-parseopt: convert --name-only
223
+ + diff-parseopt: convert --patch-with-stat
224
+ + diff-parseopt: convert --summary
225
+ + diff-parseopt: convert --check
226
+ + diff-parseopt: convert --dirstat and friends
227
+ + diff-parseopt: convert --numstat and --shortstat
228
+ + diff-parseopt: convert --patch-with-raw
229
+ (this branch uses nd/diff-parseopt.)
230
+
231
+ Second batch to teach the diff machinery to use the parse-options
232
+ API.
233
+
234
+
235
+* nd/no-more-check-racy (2019-02-22) 1 commit
236
+ (merged to 'next' on 2019-02-23 at eda76b8f46)
237
+ + Delete check-racy.c
238
+
239
+ Unused code removal.
240
+
241
+
242
+* nd/split-index-null-base-fix (2019-02-13) 1 commit
243
+ (merged to 'next' on 2019-02-13 at c404a19b7a)
244
+ + read-cache.c: fix writing "link" index ext with null base oid
245
+
246
+ Split-index fix.
247
+
248
+
249
+* rd/doc-hook-used-in-sample (2019-02-21) 1 commit
250
+ (merged to 'next' on 2019-02-23 at e521400a66)
251
+ + mention use of "hooks.allownonascii" in "man githooks"
252
+
253
+ Doc update.
254
+
255
+
256
+* rj/prune-packed-excess-args (2019-02-11) 1 commit
257
+ (merged to 'next' on 2019-02-13 at e026a2e7a7)
258
+ + prune-packed: check for too many arguments
259
+
260
+ "git prune-packed" did not notice and complain against excess
261
+ arguments given from the command line, which now it does.
262
+
263
+
264
+* sc/pack-redundant (2019-02-04) 6 commits
265
+ (merged to 'next' on 2019-02-08 at ba3f8f0bc0)
266
+ + pack-redundant: consistent sort method
267
+ + pack-redundant: rename pack_list.all_objects
268
+ + pack-redundant: new algorithm to find min packs
269
+ + pack-redundant: delete redundant code
270
+ + pack-redundant: delay creation of unique_objects
271
+ + t5323: test cases for git-pack-redundant
272
+
273
+ Update the implementation of pack-redundant for performance in a
274
+ repository with many packfiles.
275
+
276
+
277
+* tg/checkout-no-overlay (2019-02-04) 9 commits
278
+ (merged to 'next' on 2019-02-04 at 9968bcf4fb)
279
+ + revert "checkout: introduce checkout.overlayMode config"
280
+ (merged to 'next' on 2019-01-18 at 1e2a79ba5c)
281
+ + checkout: introduce checkout.overlayMode config
282
+ + checkout: introduce --{,no-}overlay option
283
+ + checkout: factor out mark_cache_entry_for_checkout function
284
+ + checkout: clarify comment
285
+ + read-cache: add invalidate parameter to remove_marked_cache_entries
286
+ + entry: support CE_WT_REMOVE flag in checkout_entry
287
+ + entry: factor out unlink_entry function
288
+ + move worktree tests to t24*
289
+
290
+ "git checkout --no-overlay" can be used to trigger a new mode of
291
+ checking out paths out of the tree-ish, that allows paths that
292
+ match the pathspec that are in the current index and working tree
293
+ and are not in the tree-ish.
294
79
-* js/anonymize-remote-curl-diag (2019-03-06) 2 commits
80
- - remote-curl: mark all error messages for translation
81
- - curl: anonymize URLs in error messages and warnings
295
83
- remote-http transport did not anonymize URLs reported in its error
84
- messages at places.
296
+* wh/author-committer-ident-config (2019-02-04) 1 commit
297
+ (merged to 'next' on 2019-02-06 at 6ab8bfa199)
298
+ + config: allow giving separate author and committer idents
299
86
- Will merge to 'next' the bottom one.
87
- The i18n of die() messages conflicts with topics in flight, so will
88
- be dealt with separately when the tree is more quiescent.
300
+ Four new configuration variables {author,committer}.{name,email}
301
+ have been introduced to override user.{name,email} in more specific
302
+ cases.
303
304
+--------------------------------------------------
305
+[New Topics]
306
91
-* js/find-lib-h-with-ls-files-when-possible (2019-03-05) 1 commit
92
- - Makefile: use `git ls-files` to list header files, if possible
307
+* rj/hdr-check-gcrypt-fix (2019-03-06) 1 commit
308
+ (merged to 'next' on 2019-03-07 at ef95cd3878)
309
+ + Makefile: fix 'hdr-check' when GCRYPT not installed
310
94
- The Makefile uses 'find' utility to enumerate all the *.h header
95
- files, which is expensive on platforms with slow filesystems; it
96
- now optionally uses "ls-files" if working within a repository,
97
- which is a trick similar to how all sources are enumerated to run
98
- ETAGS on.
311
+ The set of header files used by "make hdr-check" unconditionally
312
+ included sha256/gcrypt.h, even when it is not used, causing the
313
+ make target to fail. We now skip it when GCRYPT_SHA256 is not in
314
+ use.
315
100
- Will merge to 'next'.
316
+ Will merge to 'master'.
317
318
103
-* js/rebase-orig-head-fix (2019-03-04) 4 commits
104
- - built-in rebase: set ORIG_HEAD just once, before the rebase
105
- - built-in rebase: demonstrate that ORIG_HEAD is not set correctly
106
- - built-in rebase: use the correct reflog when switching branches
107
- - built-in rebase: no need to check out `onto` twice
319
+* br/commit-tree-parseopt (2019-03-07) 1 commit
320
+ (merged to 'next' on 2019-03-07 at d415328f75)
321
+ + commit-tree: utilize parse-options api
322
109
- "gir rebase" that was reimplemented in C did not set ORIG_HEAD
110
- correctly, which has been corrected.
323
+ The command line parser of "git commit-tree" has been rewritten to
324
+ use the parse-options API.
325
112
- Will merge to 'next'.
326
+ Will merge to 'master'.
327
328
115
-* js/rebase-recreate-merge (2019-03-01) 1 commit
116
- - rebase docs: fix "gitlink" typo
329
+* jk/config-type-color-ends-with-lf (2019-03-07) 1 commit
330
+ (merged to 'next' on 2019-03-07 at 11bedec388)
331
+ + config: document --type=color output is a complete line
332
118
- Docfix.
333
+ "git config --type=color ..." is meant to replace "git config --get-color"
334
+ but there is a slight difference that wasn't documented, which is
335
+ now fixed.
336
120
- Will merge to 'next'.
337
+ Will merge to 'master'.
338
339
123
-* js/stress-test-ui-tweak (2019-03-04) 2 commits
124
- - tests: introduce --stress-jobs=<N>
125
- - tests: let --stress-limit=<N> imply --stress
340
+* jk/guard-bswap-header (2019-03-07) 1 commit
341
+ (merged to 'next' on 2019-03-07 at 8ba06b29d4)
342
+ + compat/bswap: add include header guards
343
127
- Dev support.
344
+ The include file compat/bswap.h has been updated so that it is safe
345
+ to (accidentally) include it more than once.
346
129
- Will merge to 'next'.
347
+ Will merge to 'master'.
348
349
132
-* js/untravis-windows (2019-03-01) 1 commit
133
- - travis: remove the hack to build the Windows job on Azure Pipelines
350
+* js/remote-curl-i18n (2019-03-06) 1 commit
351
+ - remote-curl: mark all error messages for translation
352
+ (this branch uses js/anonymize-remote-curl-diag.)
353
135
- Dev support.
354
+ Error messages given from the http transport have been updated so
355
+ that they can be localized.
356
357
Will merge to 'next'.
358
359
140
-* ma/asciidoctor-fixes (2019-03-01) 3 commits
141
- - asciidoctor-extensions: fix spurious space after linkgit
142
- - Documentation/Makefile: add missing dependency on asciidoctor-extensions
143
- - Documentation/Makefile: add missing xsl dependencies for manpages
360
+* ma/asciidoctor-fixes-more (2019-03-07) 5 commits
361
+ - Documentation: turn middle-of-line tabs into spaces
362
+ - git-svn.txt: drop escaping '\' that ends up being rendered
363
+ - git.txt: remove empty line before list continuation
364
+ - config/fsck.txt: avoid starting line with dash
365
+ - config/diff.txt: drop spurious backtick
366
145
- Build fix around use of asciidoctor instead of asciidoc
367
+ Documentation mark-up fixes.
368
369
Will merge to 'next'.
370
371
150
-* nd/worktree-name-sanitization (2019-03-01) 1 commit
151
- - worktree add: sanitize worktree names
152
-
153
- Need to pick up a newer version.
154
-
155
-
156
-* ra/t3600-test-path-funcs (2019-03-04) 3 commits
157
- - t3600: use helpers to replace test -d/f/e/s <path>
158
- - t3600: restructure code according to contemporary guidelines
159
- - test functions: add function `test_file_not_empty`
160
-
161
- A GSoC micro.
162
-
163
- Need to pick up a newer version.
372
+* nd/diff-parseopt-3 (2019-03-07) 20 commits
373
+ - diff-parseopt: convert --submodule
374
+ - diff-parseopt: convert --ignore-submodules
375
+ - diff-parseopt: convert --textconv
376
+ - diff-parseopt: convert --ext-diff
377
+ - diff-parseopt: convert --quiet
378
+ - diff-parseopt: convert --exit-code
379
+ - diff-parseopt: convert --color-words
380
+ - diff-parseopt: convert --word-diff-regex
381
+ - diff-parseopt: convert --word-diff
382
+ - diff-parseopt: convert --[no-]color
383
+ - diff-parseopt: convert --[no-]follow
384
+ - diff-parseopt: convert -R
385
+ - diff-parseopt: convert -a|--text
386
+ - diff-parseopt: convert --full-index
387
+ - diff-parseopt: convert --binary
388
+ - diff-parseopt: convert --anchored
389
+ - diff-parseopt: convert --diff-algorithm
390
+ - diff-parseopt: convert --histogram
391
+ - diff-parseopt: convert --patience
392
+ - diff-parseopt: convert --[no-]indent-heuristic
393
+
394
+ Third batch to teach the diff machinery to use the parse-options
395
+ API.
396
397
166
-* rd/gc-prune-doc-fix (2019-03-03) 1 commit
167
- - docs/git-gc: fix typo "--prune=all" to "--prune=now"
398
+* rd/attr.c-comment-typofix (2019-03-07) 1 commit
399
+ (merged to 'next' on 2019-03-07 at bf8e985dd8)
400
+ + attr.c: ".gitattribute" -> ".gitattributes" (comments)
401
169
- Doxfix.
402
+ In-code comment typofix.
403
171
- Will merge to 'next'.
404
+ Will merge to 'master'.
405
406
174
-* dl/reset-doc-no-wrt-abbrev (2019-03-06) 1 commit
175
- - git-reset.txt: clarify documentation
407
+* yb/utf-16le-bom-spellfix (2019-03-07) 1 commit
408
+ (merged to 'next' on 2019-03-07 at 541d9dca55)
409
+ + gitattributes.txt: fix typo
410
411
+ Doc update.
412
178
-* ja/dir-rename-doc-markup-fix (2019-03-06) 1 commit
179
- - Doc: fix misleading asciidoc formating
413
+ Will merge to 'master'.
414
415
--------------------------------------------------
416
[Stalled]
@@ -200,26 +434,8 @@ of the repositories listed at
434
Comments?
435
436
203
-* jt/test-protocol-version (2019-02-06) 8 commits
204
- - t5552: compensate for v2 filtering ref adv.
205
- - tests: fix protocol version for overspecifications
206
- - t5700: only run with protocol version 1
207
- - t5512: compensate for v0 only sending HEAD symrefs
208
- - t5503: fix overspecification of trace expectation
209
- - tests: always test fetch of unreachable with v0
210
- - tests: define GIT_TEST_PROTOCOL_VERSION
211
- - Merge branch 'js/protocol-advertise-multi' into jt/test-protocol-version
212
- (this branch uses js/protocol-advertise-multi.)
213
-
214
- Help developers by making it easier to run most of the tests under
215
- different versions of over-the-wire protocols.
216
-
217
- Blocked by js/protocol-advertise-multi
218
-
219
-
437
* js/protocol-advertise-multi (2018-12-28) 1 commit
438
- protocol: advertise multiple supported versions
222
- (this branch is used by jt/test-protocol-version.)
439
440
The transport layer has been updated so that the protocol version
441
used can be negotiated between the parties, by the initiator
@@ -249,6 +465,24 @@ of the repositories listed at
465
I am personally not yet quite convinced if this is worth pursuing.
466
467
468
+* pw/add-p-select (2018-07-26) 4 commits
469
+ - add -p: optimize line selection for short hunks
470
+ - add -p: allow line selection to be inverted
471
+ - add -p: select modified lines correctly
472
+ - add -p: select individual hunk lines
473
+
474
+ "git add -p" interactive interface learned to let users choose
475
+ individual added/removed lines to be used in the operation, instead
476
+ of accepting or rejecting a whole hunk.
477
+
478
+ Will discard.
479
+ No further feedbacks on the topic for quite some time.
480
+
481
+ cf. <d622a95b-7302-43d4-4ec9-b2cf3388c653@talktalk.net>
482
+ I found the feature to be hard to explain, and may result in more
483
+ end-user complaints, but let's see.
484
+
485
+
486
* nb/branch-show-other-worktrees-head (2019-02-01) 3 commits
487
- branch: add an extra verbose output displaying worktree path for refs checked out in a linked worktree
488
- branch: mark and color a branch differently if it is checked out in a linked worktree
@@ -260,190 +494,232 @@ of the repositories listed at
494
with '*' in front.
495
496
The top one probably deserves retitling.
263
- The second one is of dubious value.
497
+ The second one is of dubious value, but if we are keeping it,
498
+ it should also be retitled.
499
500
--------------------------------------------------
501
[Cooking]
502
268
-* bp/post-index-change-hook (2019-02-15) 1 commit
269
- (merged to 'next' on 2019-02-23 at 70cc07cebe)
270
- + read-cache: add post-index-change hook
503
+* jt/test-protocol-version (2019-03-07) 8 commits
504
+ - t5552: compensate for v2 filtering ref adv.
505
+ - tests: fix protocol version for overspecifications
506
+ - t5700: only run with protocol version 1
507
+ - t5512: compensate for v0 only sending HEAD symrefs
508
+ - t5503: fix overspecification of trace expectation
509
+ - tests: always test fetch of unreachable with v0
510
+ - t5601: check ssh command only with protocol v0
511
+ - tests: define GIT_TEST_PROTOCOL_VERSION
512
272
- A new hook "post-index-change" is called when the on-disk index
273
- file changes, which can help e.g. a virtualized working tree
274
- implementation.
513
+ Help developers by making it easier to run most of the tests under
514
+ different versions of over-the-wire protocols.
515
276
- Will cook in 'next'.
516
517
+* jk/bisect-final-output (2019-03-01) 3 commits
518
+ (merged to 'next' on 2019-03-07 at 1d429b237a)
519
+ + bisect: make diff-tree output prettier
520
+ + bisect: fix internal diff-tree config loading
521
+ + bisect: use string arguments to feed internal diff-tree
522
279
-* dl/doc-submodule-wo-subcommand (2019-02-15) 1 commit
280
- (merged to 'next' on 2019-02-23 at 2f1c1428f1)
281
- + submodule: document default behavior
523
+ The final report from "git bisect" used to show the suspected
524
+ culprit using a raw "diff-tree", with which there is no output for
525
+ a merge commit. This has been updated to use a more modern and
526
+ human readable output that still is concise enough.
527
283
- Doc update.
528
+ Will merge to 'master'.
529
+
530
+
531
+* jk/fsck-doc (2019-03-05) 2 commits
532
+ (merged to 'next' on 2019-03-07 at 7826e889a6)
533
+ + fsck: always compute USED flags for unreachable objects
534
+ + doc/fsck: clarify --connectivity-only behavior
535
+
536
+ "git fsck --connectivity-only" omits computation necessary to sift
537
+ the objects that are not reachable from any of the refs into
538
+ unreachable and dangling. This is now enabled when dangling
539
+ objects are requested (which is done by default, but can be
540
+ overridden with the "--no-dangling" option).
541
542
Will merge to 'master'.
543
544
288
-* jc/format-patch-error-check (2019-02-22) 3 commits
289
- - format-patch: --no-clobber refrains from overwriting output files
290
- - format-patch: notice failure to open cover letter for writing
291
- - builtin/log: downcase the beginning of error messages
545
+* jk/no-sigpipe-during-network-transport (2019-03-05) 2 commits
546
+ (merged to 'next' on 2019-03-07 at 59fe6aa5ac)
547
+ + fetch: ignore SIGPIPE during network operation
548
+ + fetch: avoid calling write_or_die()
549
293
- "git format-patch" used overwrite an existing patch/cover-letter
294
- file. A new "--no-clobber" option stops it.
550
+ On platforms where "git fetch" is killed with SIGPIPE (e.g. OSX),
551
+ the upload-pack that runs on the other end that hangs up after
552
+ detecting an error could cause "git fetch" to die with a signal,
553
+ which led to a flakey test. "git fetch" now ignores SIGPIPE during
554
+ the network portion of its operation (this is not a problem as we
555
+ check the return status from our write(2)s).
556
296
- Will merge to 'next' after dropping the tip commit.
297
- I think the bottom two were indenendently good changes; the top one
298
- was met with "Meh" by reviewer(s), and I tend to agree.
557
+ Will merge to 'master'.
558
559
301
-* jk/diff-no-index-initialize (2019-02-24) 1 commit
302
- (merged to 'next' on 2019-02-24 at f37a814eb0)
303
- + diff: reuse diff setup for --no-index case
560
+* jk/virtual-objects-do-exist (2019-03-05) 1 commit
561
+ (merged to 'next' on 2019-03-07 at d6937e8e46)
562
+ + rev-list: allow cached objects in existence check
563
305
- "git diff --no-index" may still want to access Git goodies like
306
- --ext-diff and --textconv, but so far these have been ignored,
307
- which has been corrected.
564
+ A recent update broke "is this object available to us?" check for
565
+ well-known objects like an empty tree (which should yield "yes",
566
+ even when there is no on-disk object for an empty tree), which has
567
+ been corrected.
568
569
Will merge to 'master'.
570
571
312
-* jk/prune-optim (2019-02-14) 4 commits
313
- (merged to 'next' on 2019-02-23 at 7d03afc1c2)
314
- + t5304: rename "sha1" variables to "oid"
315
- + prune: check SEEN flag for reachability
316
- + prune: use bitmaps for reachability traversal
317
- + prune: lazily perform reachability traversal
572
+* js/anonymize-remote-curl-diag (2019-03-05) 1 commit
573
+ - curl: anonymize URLs in error messages and warnings
574
+ (this branch is used by js/remote-curl-i18n.)
575
319
- "git prune" has been taught to take advantage of reachability
320
- bitmap when able.
576
+ remote-http transport did not anonymize URLs reported in its error
577
+ messages at places.
578
+
579
+ Will merge to 'next' the bottom one.
580
+ The i18n of die() messages conflicts with topics in flight, so will
581
+ be dealt with separately when the tree is more quiescent.
582
+
583
+
584
+* js/find-lib-h-with-ls-files-when-possible (2019-03-05) 1 commit
585
+ (merged to 'next' on 2019-03-07 at 0572e4704c)
586
+ + Makefile: use `git ls-files` to list header files, if possible
587
+
588
+ The Makefile uses 'find' utility to enumerate all the *.h header
589
+ files, which is expensive on platforms with slow filesystems; it
590
+ now optionally uses "ls-files" if working within a repository,
591
+ which is a trick similar to how all sources are enumerated to run
592
+ ETAGS on.
593
594
Will merge to 'master'.
595
596
325
-* jk/unused-params (2019-02-14) 10 commits
326
- (merged to 'next' on 2019-02-23 at 9b715907a1)
327
- + ref-filter: drop unused "sz" parameters
328
- + ref-filter: drop unused "obj" parameters
329
- + ref-filter: drop unused buf/sz pairs
330
- + files-backend: drop refs parameter from split_symref_update()
331
- + pack-objects: drop unused parameter from oe_map_new_pack()
332
- + merge-recursive: drop several unused parameters
333
- + diff: drop complete_rewrite parameter from run_external_diff()
334
- + diff: drop unused emit data parameter from sane_truncate_line()
335
- + diff: drop unused color reset parameters
336
- + diff: drop options parameter from diffcore_fix_diff_index()
597
+* js/rebase-orig-head-fix (2019-03-04) 4 commits
598
+ (merged to 'next' on 2019-03-07 at f805f820b4)
599
+ + built-in rebase: set ORIG_HEAD just once, before the rebase
600
+ + built-in rebase: demonstrate that ORIG_HEAD is not set correctly
601
+ + built-in rebase: use the correct reflog when switching branches
602
+ + built-in rebase: no need to check out `onto` twice
603
338
- Code clean-up.
604
+ "git rebase" that was reimplemented in C did not set ORIG_HEAD
605
+ correctly, which has been corrected.
606
607
Will merge to 'master'.
608
609
343
-* jt/http-auth-proto-v2-fix (2019-03-03) 5 commits
344
- (merged to 'next' on 2019-03-03 at d0fdc53f3a)
345
- + remote-curl: use post_rpc() for protocol v2 also
346
- + remote-curl: refactor reading into rpc_state's buf
347
- + remote-curl: reduce scope of rpc_state.result
348
- + remote-curl: reduce scope of rpc_state.stdin_preamble
349
- + remote-curl: reduce scope of rpc_state.argv
610
+* js/rebase-recreate-merge (2019-03-01) 1 commit
611
+ (merged to 'next' on 2019-03-07 at da81e64430)
612
+ + rebase docs: fix "gitlink" typo
613
351
- Unify RPC code for smart http in protocol v0/v1 and v2, which fixes
352
- a bug in the latter (lack of authentication retry) and generally
353
- improves the code base.
614
+ Docfix.
615
616
Will merge to 'master'.
617
618
358
-* en/merge-options-doc (2019-02-21) 1 commit
359
- (merged to 'next' on 2019-02-23 at 2eb5263dab)
360
- + merge-options.txt: correct wording of --no-commit option
619
+* js/stress-test-ui-tweak (2019-03-04) 2 commits
620
+ (merged to 'next' on 2019-03-07 at 9b1cc1a73e)
621
+ + tests: introduce --stress-jobs=<N>
622
+ + tests: let --stress-limit=<N> imply --stress
623
362
- Doc update.
624
+ Dev support.
625
626
Will merge to 'master'.
627
628
367
-* ab/receive-pack-use-after-free-fix (2019-02-20) 1 commit
368
- (merged to 'next' on 2019-02-23 at 3f41dfe375)
369
- + receive-pack: fix use-after-free bug
629
+* js/untravis-windows (2019-03-01) 1 commit
630
+ (merged to 'next' on 2019-03-07 at 54ca7ffeea)
631
+ + travis: remove the hack to build the Windows job on Azure Pipelines
632
371
- Memfix.
633
+ Dev support.
634
635
Will merge to 'master'.
636
637
376
-* nd/diff-parseopt-2 (2019-02-21) 21 commits
377
- (merged to 'next' on 2019-02-23 at 6f11d0af54)
378
- + diff-parseopt: convert --ignore-some-changes
379
- + diff-parseopt: convert --[no-]minimal
380
- + diff-parseopt: convert --relative
381
- + diff-parseopt: convert --no-renames|--[no--rename-empty
382
- + diff-parseopt: convert --find-copies-harder
383
- + diff-parseopt: convert -C|--find-copies
384
- + diff-parseopt: convert -D|--irreversible-delete
385
- + diff-parseopt: convert -M|--find-renames
386
- + diff-parseopt: convert -B|--break-rewrites
387
- + diff-parseopt: convert --output-*
388
- + diff-parseopt: convert --[no-]compact-summary
389
- + diff-parseopt: convert --stat*
390
- + diff-parseopt: convert -s|--no-patch
391
- + diff-parseopt: convert --name-status
392
- + diff-parseopt: convert --name-only
393
- + diff-parseopt: convert --patch-with-stat
394
- + diff-parseopt: convert --summary
395
- + diff-parseopt: convert --check
396
- + diff-parseopt: convert --dirstat and friends
397
- + diff-parseopt: convert --numstat and --shortstat
398
- + diff-parseopt: convert --patch-with-raw
399
- (this branch uses nd/diff-parseopt.)
638
+* ma/asciidoctor-fixes (2019-03-01) 3 commits
639
+ (merged to 'next' on 2019-03-07 at 005fea5996)
640
+ + asciidoctor-extensions: fix spurious space after linkgit
641
+ + Documentation/Makefile: add missing dependency on asciidoctor-extensions
642
+ + Documentation/Makefile: add missing xsl dependencies for manpages
643
+
644
+ Build fix around use of asciidoctor instead of asciidoc
645
+
646
+ Will cook in 'next'.
647
+
648
+
649
+* nd/worktree-name-sanitization (2019-03-07) 2 commits
650
+ - worktree add: sanitize worktree names
651
+ - refs.c: refactor check_refname_component()
652
+
653
+ In recent versions of Git, per-worktree refs are exposed in
654
+ refs/worktrees/<wtname>/ hierarchy, which means that worktree names
655
+ must be a valid refname component. The code now sanitizes the names
656
+ given to worktrees, to make sure these refs are not malforked.
657
+
658
401
- Second batch to teach the diff machinery to use the parse-options
402
- API.
659
+* ra/t3600-test-path-funcs (2019-03-04) 3 commits
660
+ - t3600: use helpers to replace test -d/f/e/s <path>
661
+ - t3600: restructure code according to contemporary guidelines
662
+ - test functions: add function `test_file_not_empty`
663
404
- Will merge to 'master'.
664
+ A GSoC micro.
665
666
+ Need to pick up a newer version.
667
407
-* nd/completion-more-parameters (2019-02-20) 1 commit
408
- (merged to 'next' on 2019-02-23 at 23133710f7)
409
- + completion: add more parameter value completion
668
411
- The command line completion (in contrib/) has been taught to
412
- complete more subcommand parameters.
669
+* rd/gc-prune-doc-fix (2019-03-03) 1 commit
670
+ (merged to 'next' on 2019-03-07 at fdd4dda2e0)
671
+ + docs/git-gc: fix typo "--prune=all" to "--prune=now"
672
+
673
+ Doxfix.
674
675
Will merge to 'master'.
676
677
417
-* nd/no-more-check-racy (2019-02-22) 1 commit
418
- (merged to 'next' on 2019-02-23 at eda76b8f46)
419
- + Delete check-racy.c
678
+* dl/reset-doc-no-wrt-abbrev (2019-03-06) 1 commit
679
+ - git-reset.txt: clarify documentation
680
421
- Unused code removal.
681
423
- Will merge to 'master'.
682
+* ja/dir-rename-doc-markup-fix (2019-03-06) 1 commit
683
+ - Doc: fix misleading asciidoc formating
684
685
426
-* rd/doc-hook-used-in-sample (2019-02-21) 1 commit
427
- (merged to 'next' on 2019-02-23 at e521400a66)
428
- + mention use of "hooks.allownonascii" in "man githooks"
686
+* bp/post-index-change-hook (2019-02-15) 1 commit
687
+ (merged to 'next' on 2019-02-23 at 70cc07cebe)
688
+ + read-cache: add post-index-change hook
689
430
- Doc update.
690
+ A new hook "post-index-change" is called when the on-disk index
691
+ file changes, which can help e.g. a virtualized working tree
692
+ implementation.
693
432
- Will merge to 'master'.
694
+ Will cook in 'next'.
695
+
696
+
697
+* jc/format-patch-error-check (2019-02-22) 3 commits
698
+ - format-patch: --no-clobber refrains from overwriting output files
699
+ - format-patch: notice failure to open cover letter for writing
700
+ - builtin/log: downcase the beginning of error messages
701
+
702
+ "git format-patch" used overwrite an existing patch/cover-letter
703
+ file. A new "--no-clobber" option stops it.
704
+
705
+ Will merge to 'next' after dropping the tip commit.
706
+ I think the bottom two were indenendently good changes; the top one
707
+ was met with "Meh" by reviewer(s), and I tend to agree.
708
709
710
* ab/makefile-help-devs-more (2019-02-24) 6 commits
436
- - Makefile: allow for combining DEVELOPER=1 and CFLAGS="..."
437
- - Makefile: move the setting of *FLAGS closer to "include"
438
- - Makefile: Move *_LIBS assignment into its own section
439
- - Makefile: add/remove comments at top and tweak whitespace
440
- - Makefile: move "strip" assignment down from flags
441
- - Makefile: remove an out-of-date comment
442
-
443
- CFLAGS now can be tweked when invoking Make while using
711
+ (merged to 'next' on 2019-03-07 at fa05e1a2ae)
712
+ + Makefile: allow for combining DEVELOPER=1 and CFLAGS="..."
713
+ + Makefile: move the setting of *FLAGS closer to "include"
714
+ + Makefile: Move *_LIBS assignment into its own section
715
+ + Makefile: add/remove comments at top and tweak whitespace
716
+ + Makefile: move "strip" assignment down from flags
717
+ + Makefile: remove an out-of-date comment
718
+
719
+ CFLAGS now can be tweaked when invoking Make while using
720
DEVELOPER=YesPlease; this did not work well before.
721
446
- Will merge to 'next'.
722
+ Will cook in 'next'.
723
724
725
* jt/fetch-cdn-offload (2019-03-01) 9 commits
@@ -472,53 +748,6 @@ of the repositories listed at
748
Need to attach sign-off; other than that it seems OK to be in 'next'.
749
750
475
-* jc/test-yes-doc (2019-02-11) 1 commit
476
- (merged to 'next' on 2019-02-13 at cffac01759)
477
- + test: caution on our version of 'yes'
478
-
479
- Test doc update.
480
-
481
- Will merge to 'master'.
482
-
483
-
484
-* nd/split-index-null-base-fix (2019-02-13) 1 commit
485
- (merged to 'next' on 2019-02-13 at c404a19b7a)
486
- + read-cache.c: fix writing "link" index ext with null base oid
487
-
488
- Split-index fix.
489
-
490
- Will merge to 'master'.
491
-
492
-
493
-* rj/prune-packed-excess-args (2019-02-11) 1 commit
494
- (merged to 'next' on 2019-02-13 at e026a2e7a7)
495
- + prune-packed: check for too many arguments
496
-
497
- "git prune-packed" did not notice and complain against excess
498
- arguments given from the command line, which now it does.
499
-
500
- Will merge to 'master'.
501
-
502
-
503
-* js/doc-symref-in-proto-v1 (2019-02-21) 1 commit
504
- (merged to 'next' on 2019-02-21 at c7ca3bb974)
505
- + protocol-capabilities.txt: document symref
506
-
507
- Doc update.
508
-
509
- Will merge to 'master'.
510
-
511
-
512
-* dl/complete-submodule-absorbgitdirs (2019-02-06) 1 commit
513
- (merged to 'next' on 2019-02-06 at c4e0cd535a)
514
- + completion: complete git submodule absorbgitdirs
515
-
516
- Command-line completion (in contrib/) learned to tab-complete the
517
- "git submodule absorbgitdirs" subcommand.
518
-
519
- Will merge to 'master'.
520
-
521
-
751
* dm/some-stdio-functions-are-macro-on-freebsd (2019-02-01) 1 commit
752
- http: cast result to FILE *
753
@@ -529,17 +758,6 @@ of the repositories listed at
758
cf. <49B9198C-53E5-42BD-8834-B1EDEB3332CB@usask.ca>
759
760
532
-* en/combined-all-paths (2019-02-07) 1 commit
533
- (merged to 'next' on 2019-02-08 at 7057f38d6e)
534
- + log,diff-tree: add --combined-all-paths option
535
-
536
- Output from "diff --cc" did not show the original paths when the
537
- merge involved renames. A new option adds the paths in the
538
- original trees to the output.
539
-
540
- Will merge to 'master'.
541
-
542
-
761
* ds/commit-graph-format-v2 (2019-01-29) 8 commits
762
- SQUASH : misnamed variables and style fix
763
- commit-graph: test verifying a corrupt v2 header
@@ -556,29 +774,6 @@ of the repositories listed at
774
Needs update before merging to 'next'.
775
776
559
-* jh/trace2 (2019-02-22) 15 commits
560
- (merged to 'next' on 2019-02-22 at 4c84c621fe)
561
- + trace2: add for_each macros to clang-format
562
- + trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
563
- + trace2:data: add subverb for rebase
564
- + trace2:data: add subverb to reset command
565
- + trace2:data: add subverb to checkout command
566
- + trace2:data: pack-objects: add trace2 regions
567
- + trace2:data: add trace2 instrumentation to index read/write
568
- + trace2:data: add trace2 hook classification
569
- + trace2:data: add trace2 transport child classification
570
- + trace2:data: add trace2 sub-process classification
571
- + trace2:data: add editor/pager child classification
572
- + trace2:data: add trace2 regions to wt-status
573
- + trace2: collect Windows-specific process information
574
- + trace2: create new combined trace facility
575
- + trace2: Documentation/technical/api-trace2.txt
576
-
577
- A more structured way to obtain execution trace has been added.
578
-
579
- Will merge to 'master'.
580
-
581
-
777
* sx/evolve (2019-02-15) 8 commits
778
. evolve: add the git change list command
779
. evolve: implement the git change command
@@ -606,47 +801,6 @@ of the repositories listed at
801
Needs update before merging to 'next'.
802
803
609
-* nd/diff-parseopt (2019-01-27) 14 commits
610
- (merged to 'next' on 2019-02-05 at 7c4b79aa79)
611
- + diff.c: convert --raw
612
- + diff.c: convert -W|--[no-]function-context
613
- + diff.c: convert -U|--unified
614
- + diff.c: convert -u|-p|--patch
615
- + diff.c: prepare to use parse_options() for parsing
616
- + diff.h: avoid bit fields in struct diff_flags
617
- + diff.h: keep forward struct declarations sorted
618
- + parse-options: allow ll_callback with OPTION_CALLBACK
619
- + parse-options: avoid magic return codes
620
- + parse-options: stop abusing 'callback' for lowlevel callbacks
621
- + parse-options: add OPT_BITOP()
622
- + parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN
623
- + parse-options: add one-shot mode
624
- + parse-options.h: remove extern on function prototypes
625
- (this branch is used by nd/diff-parseopt-2.)
626
-
627
- The diff machinery, one of the oldest parts of the system, which
628
- long predates the parse-options API, uses fairly long and complex
629
- handcrafted option parser. This is being rewritten to use the
630
- parse-options API.
631
-
632
- Will merge to 'master'.
633
-
634
-
635
-* sc/pack-redundant (2019-02-04) 6 commits
636
- (merged to 'next' on 2019-02-08 at ba3f8f0bc0)
637
- + pack-redundant: consistent sort method
638
- + pack-redundant: rename pack_list.all_objects
639
- + pack-redundant: new algorithm to find min packs
640
- + pack-redundant: delete redundant code
641
- + pack-redundant: delay creation of unique_objects
642
- + t5323: test cases for git-pack-redundant
643
-
644
- Update the implementation of pack-redundant for performance in a
645
- repository with many packfiles.
646
-
647
- Will merge to 'master'.
648
-
649
-
804
* nd/config-move-to (2019-01-14) 7 commits
805
- config.h: fix hdr-check warnings
806
- config: add --move-to
@@ -660,49 +814,16 @@ of the repositories listed at
814
815
816
* ma/clear-repository-format (2019-03-01) 2 commits
663
- - setup: fix memory leaks with `struct repository_format`
664
- - setup: free old value before setting `work_tree`
817
+ (merged to 'next' on 2019-03-07 at 4bf5502fe2)
818
+ + setup: fix memory leaks with `struct repository_format`
819
+ + setup: free old value before setting `work_tree`
820
821
The setup code has been cleaned up to avoid leaks around the
822
repository_format structure.
823
669
- Will merge to 'next'.
670
-
671
-
672
-* wh/author-committer-ident-config (2019-02-04) 1 commit
673
- (merged to 'next' on 2019-02-06 at 6ab8bfa199)
674
- + config: allow giving separate author and committer idents
675
-
676
- Four new configuration variables {author,committer}.{name,email}
677
- have been introduced to override user.{name,email} in more specific
678
- cases.
679
-
824
Will merge to 'master'.
825
826
683
-* tg/checkout-no-overlay (2019-02-04) 9 commits
684
- (merged to 'next' on 2019-02-04 at 9968bcf4fb)
685
- + revert "checkout: introduce checkout.overlayMode config"
686
- (merged to 'next' on 2019-01-18 at 1e2a79ba5c)
687
- + checkout: introduce checkout.overlayMode config
688
- + checkout: introduce --{,no-}overlay option
689
- + checkout: factor out mark_cache_entry_for_checkout function
690
- + checkout: clarify comment
691
- + read-cache: add invalidate parameter to remove_marked_cache_entries
692
- + entry: support CE_WT_REMOVE flag in checkout_entry
693
- + entry: factor out unlink_entry function
694
- + move worktree tests to t24*
695
-
696
- "git checkout --no-overlay" can be used to trigger a new mode of
697
- checking out paths out of the tree-ish, that allows paths that
698
- match the pathspec that are in the current index and working tree
699
- and are not in the tree-ish.
700
-
701
- Will hold.
702
- Waiting for "restore-files" & "switch-branches" pair.
703
- cf. <20190205204208.GC6085@hank.intra.tgummerer.com>
704
-
705
-
827
* dl/merge-cleanup-scissors-fix (2019-01-27) 4 commits
828
(merged to 'next' on 2019-02-06 at f4fe5d759a)
829
+ merge: add scissors line on merge conflict
@@ -716,24 +837,9 @@ of the repositories listed at
837
out just like the list of updated paths and other information to
838
help the user explain the merge better.
839
719
- Will merge to 'master'.
720
-
721
-
722
-* aw/pretty-trailers (2019-01-29) 7 commits
723
- (merged to 'next' on 2019-02-06 at b7e5437702)
724
- + pretty: add support for separator option in %(trailers)
725
- + strbuf: separate callback for strbuf_expand:ing literals
726
- + pretty: add support for "valueonly" option in %(trailers)
727
- + pretty: allow showing specific trailers
728
- + pretty: single return path in %(trailers) handling
729
- + pretty: allow %(trailers) options with explicit value
730
- + doc: group pretty-format.txt placeholders descriptions
731
-
732
- The %(trailers) formatter in "git log --format=..." now allows to
733
- optionally pick trailers selectively by keyword, show only values,
734
- etc.
735
-
736
- Will merge to 'master'.
840
+ Hold to replace or fixup.
841
+ cf. <20190306014143.GA2580@dev-l>
842
+ cf. <xmqqpnr3po0g.fsf@gitster-ct.c.googlers.com>
843
844
845
* jn/unknown-index-extensions (2018-11-21) 2 commits
@@ -746,22 +852,15 @@ of the repositories listed at
852
Expecting a reroll.
853
854
749
-* du/branch-show-current (2018-10-26) 1 commit
750
- (merged to 'next' on 2019-02-08 at e662ed4aee)
751
- + branch: introduce --show-current display option
752
-
753
- "git branch" learned a new subcommand "--show-current".
754
-
755
- Will merge to 'master'.
756
-
757
-
758
-* ag/sequencer-reduce-rewriting-todo (2019-01-29) 16 commits
759
- - rebase--interactive: move transform_todo_file() to rebase--interactive.c
855
+* ag/sequencer-reduce-rewriting-todo (2019-03-07) 18 commits
856
+ - rebase--interactive: move transform_todo_file()
857
- sequencer: use edit_todo_list() in complete_action()
858
- rebase-interactive: rewrite edit_todo_list() to handle the initial edit
859
- rebase-interactive: append_todo_help() changes
860
- rebase-interactive: use todo_list_write_to_file() in edit_todo_list()
861
- sequencer: refactor skip_unnecessary_picks() to work on a todo_list
862
+ - rebase--interactive: move rearrange_squash_in_todo_file()
863
+ - rebase--interactive: move sequencer_add_exec_commands()
864
- sequencer: change complete_action() to use the refactored functions
865
- sequencer: make sequencer_make_script() write its script to a strbuf
866
- sequencer: refactor rearrange_squash() to work on a todo_list
@@ -780,8 +879,6 @@ of the repositories listed at
879
around in-core to avoid rewriting the same file over and over
880
unnecessarily.
881
783
- Need to pick up a newer version.
784
-
882
883
* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
884
- add -p: coalesce hunks before testing applicability
@@ -793,54 +890,38 @@ of the repositories listed at
890
cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
891
892
796
-* ps/stash-in-c (2019-03-01) 28 commits
797
- - tests: add a special setup where stash.useBuiltin is off
798
- - stash: optionally use the scripted version again
799
- - stash: add back the original, scripted `git stash`
800
- - stash: convert `stash--helper.c` into `stash.c`
801
- - stash: replace all `write-tree` child processes with API calls
802
- - stash: optimize `get_untracked_files()` and `check_changes()`
803
- - stash: convert save to builtin
804
- - stash: make push -q quiet
805
- - stash: convert push to builtin
806
- - stash: convert create to builtin
807
- - stash: convert store to builtin
808
- - stash: convert show to builtin
809
- - stash: convert list to builtin
810
- - stash: convert pop to builtin
811
- - stash: convert branch to builtin
812
- - stash: convert drop and clear to builtin
813
- - stash: convert apply to builtin
814
- - stash: mention options in `show` synopsis
815
- - stash: add tests for `git stash show` config
816
- - stash: rename test cases to be more descriptive
817
- - t3903: add test for --intent-to-add file
818
- - t3903: modernize style
819
- - stash: improve option parsing test coverage
820
- - ident: add the ability to provide a "fallback identity"
821
- - strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`
822
- - strbuf.c: add `strbuf_join_argv()`
823
- - sha1-name.c: add `get_oidf()` which acts like `get_oid()`
824
- - Merge branch 'sd/stash-wo-user-name'
893
+* ps/stash-in-c (2019-03-07) 29 commits
894
+ (merged to 'next' on 2019-03-07 at a2753bc9d4)
895
+ + tests: add a special setup where stash.useBuiltin is off
896
+ + stash: optionally use the scripted version again
897
+ + stash: add back the original, scripted `git stash`
898
+ + stash: convert `stash--helper.c` into `stash.c`
899
+ + stash: replace all `write-tree` child processes with API calls
900
+ + stash: optimize `get_untracked_files()` and `check_changes()`
901
+ + stash: convert save to builtin
902
+ + stash: make push -q quiet
903
+ + stash: convert push to builtin
904
+ + stash: convert create to builtin
905
+ + stash: convert store to builtin
906
+ + stash: convert show to builtin
907
+ + stash: convert list to builtin
908
+ + stash: convert pop to builtin
909
+ + stash: convert branch to builtin
910
+ + stash: convert drop and clear to builtin
911
+ + stash: convert apply to builtin
912
+ + stash: mention options in `show` synopsis
913
+ + stash: add tests for `git stash show` config
914
+ + stash: rename test cases to be more descriptive
915
+ + t3903: add test for --intent-to-add file
916
+ + t3903: modernize style
917
+ + stash: improve option parsing test coverage
918
+ + ident: don't require calling prepare_fallback_ident first
919
+ + ident: add the ability to provide a "fallback identity"
920
+ + strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`
921
+ + strbuf.c: add `strbuf_join_argv()`
922
+ + sha1-name.c: add `get_oidf()` which acts like `get_oid()`
923
+ + Merge branch 'sd/stash-wo-user-name'
924
925
"git stash" rewritten in C.
926
828
- Will merge to 'next'.
829
-
830
-
831
-* pw/add-p-select (2018-07-26) 4 commits
832
- - add -p: optimize line selection for short hunks
833
- - add -p: allow line selection to be inverted
834
- - add -p: select modified lines correctly
835
- - add -p: select individual hunk lines
836
-
837
- "git add -p" interactive interface learned to let users choose
838
- individual added/removed lines to be used in the operation, instead
839
- of accepting or rejecting a whole hunk.
840
-
841
- Will discard.
842
- No further feedbacks on the topic for quite some time.
843
-
844
- cf. <d622a95b-7302-43d4-4ec9-b2cf3388c653@talktalk.net>
845
- I found the feature to be hard to explain, and may result in more
846
- end-user complaints, but let's see.
927
+ Will cook in 'next'.