What's cooking (2019/03 #03)
Junio C Hamano committed
Mar 11, 2019 at 18:06 UTC
ed20f7fd286334d2b2729be2810e4e920b0aa275
1 file changed
+237
-425
whats-cooking.txt
+237
-425
@@ -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, #02; Thu, 7)
4
-X-master-at: 6e0cc6776106079ed4efa0cc9abace4107657abf
5
-X-next-at: 541d9dca55dd03b320a37ba2a509dab20ca41c98
3
+Subject: What's cooking in git.git (Mar 2019, #03; Mon, 11)
4
+X-master-at: e902e9bcae2010bc42648c80ab6adc6c5a16a4a5
5
+X-next-at: 810b269d1ac4b032a1c9788e5590ee2dd9ccd984
6
7
-What's cooking in git.git (Mar 2019, #02; Thu, 7)
7
+What's cooking in git.git (Mar 2019, #03; Mon, 11)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,12 +12,9 @@ Here are the topics that have been cooking. Commits prefixed with
12
'+' are in 'next'. The ones marked with '.' do not appear in any of
13
the integration branches, but I am still holding onto them.
14
15
-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.
15
+The tip of 'next' has been rewound, ejecting a few topics that
16
+deserve a chance for a fresh restart. I plan to flush most of the
17
+other topics still in 'next' to 'master' sometime this week.
18
19
You can find the changes described here in the integration branches
20
of the repositories listed at
@@ -27,282 +24,52 @@ of the repositories listed at
24
--------------------------------------------------
25
[Graduated to "master"]
26
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
-
34
- Memfix.
35
-
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
-
47
- The %(trailers) formatter in "git log --format=..." now allows to
48
- optionally pick trailers selectively by keyword, show only values,
49
- etc.
50
-
51
-
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
-
59
-
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
-
64
- Doc update.
65
-
66
-
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
- "git branch" learned a new subcommand "--show-current".
72
-
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
27
+* jk/guard-bswap-header (2019-03-07) 1 commit
28
+ (merged to 'next' on 2019-03-07 at 8ba06b29d4)
29
+ + compat/bswap: add include header guards
30
246
- Split-index fix.
31
+ The include file compat/bswap.h has been updated so that it is safe
32
+ to (accidentally) include it more than once.
33
34
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"
35
+* js/find-lib-h-with-ls-files-when-possible (2019-03-05) 1 commit
36
+ (merged to 'next' on 2019-03-07 at 0572e4704c)
37
+ + Makefile: use `git ls-files` to list header files, if possible
38
253
- Doc update.
39
+ The Makefile uses 'find' utility to enumerate all the *.h header
40
+ files, which is expensive on platforms with slow filesystems; it
41
+ now optionally uses "ls-files" if working within a repository,
42
+ which is a trick similar to how all sources are enumerated to run
43
+ ETAGS on.
44
45
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
46
+* js/rebase-recreate-merge (2019-03-01) 1 commit
47
+ (merged to 'next' on 2019-03-07 at da81e64430)
48
+ + rebase docs: fix "gitlink" typo
49
260
- "git prune-packed" did not notice and complain against excess
261
- arguments given from the command line, which now it does.
50
+ Docfix.
51
52
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
53
+* js/untravis-windows (2019-03-01) 1 commit
54
+ (merged to 'next' on 2019-03-07 at 54ca7ffeea)
55
+ + travis: remove the hack to build the Windows job on Azure Pipelines
56
273
- Update the implementation of pack-redundant for performance in a
274
- repository with many packfiles.
57
+ Dev support.
58
59
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*
60
+* rd/attr.c-comment-typofix (2019-03-07) 1 commit
61
+ (merged to 'next' on 2019-03-07 at bf8e985dd8)
62
+ + attr.c: ".gitattribute" -> ".gitattributes" (comments)
63
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.
64
+ In-code comment typofix.
65
66
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
67
+* rd/gc-prune-doc-fix (2019-03-03) 1 commit
68
+ (merged to 'next' on 2019-03-07 at fdd4dda2e0)
69
+ + docs/git-gc: fix typo "--prune=all" to "--prune=now"
70
300
- Four new configuration variables {author,committer}.{name,email}
301
- have been introduced to override user.{name,email} in more specific
302
- cases.
71
+ Docfix.
72
304
---------------------------------------------------
305
-[New Topics]
73
74
* rj/hdr-check-gcrypt-fix (2019-03-06) 1 commit
75
(merged to 'next' on 2019-03-07 at ef95cd3878)
@@ -313,108 +80,101 @@ of the repositories listed at
80
make target to fail. We now skip it when GCRYPT_SHA256 is not in
81
use.
82
316
- Will merge to 'master'.
317
-
83
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
-
323
- The command line parser of "git commit-tree" has been rewritten to
324
- use the parse-options API.
84
+* yb/utf-16le-bom-spellfix (2019-03-07) 1 commit
85
+ (merged to 'next' on 2019-03-07 at 541d9dca55)
86
+ + gitattributes.txt: fix typo
87
326
- Will merge to 'master'.
88
+ Doc update.
89
90
+--------------------------------------------------
91
+[New Topics]
92
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
93
+* dl/ignore-docs (2019-03-08) 2 commits
94
+ - docs: move core.excludesFile from git-add to gitignore
95
+ - git-clean.txt: clarify ignore pattern files
96
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.
97
+ Doc update.
98
337
- Will merge to 'master'.
99
+ Will merge to 'next'.
100
101
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
102
+* jh/resize-convert-scratch-buffer (2019-03-08) 1 commit
103
+ - convert: avoid malloc of original file size
104
344
- The include file compat/bswap.h has been updated so that it is safe
345
- to (accidentally) include it more than once.
105
+ When the "clean" filter can reduce the size of a huge file in the
106
+ working tree down to a small "token" (a la Git LFS), there is no
107
+ point in allocating a huge scratch area upfront, but the buffer is
108
+ sized based on the original file size. The convert mechanism now
109
+ allocates very minimum and reallocates as it receives the output
110
+ from the clean filter process.
111
347
- Will merge to 'master'.
112
+ Will merge to 'next'.
113
114
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.)
115
+* jk/line-log-with-patch (2019-03-11) 2 commits
116
+ - line-log: detect unsupported formats
117
+ - line-log: suppress diff output with "-s"
118
354
- Error messages given from the http transport have been updated so
355
- that they can be localized.
119
+ "git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
120
+ output as it should. This has been corrected.
121
122
Will merge to 'next'.
123
124
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
125
+* js/rebase-deprecate-preserve-merges (2019-03-08) 1 commit
126
+ - rebase: deprecate --preserve-merges
127
367
- Documentation mark-up fixes.
128
+ "git rebase --rebase-merges" replaces its old "--preserve-merges"
129
+ option; the latter is now marked as deprecated.
130
131
Will merge to 'next'.
132
133
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
134
+* js/init-db-update-for-mingw (2019-03-08) 1 commit
135
+ - mingw: respect core.hidedotfiles = false in git-init again
136
394
- Third batch to teach the diff machinery to use the parse-options
395
- API.
137
+ "git init" forgot to read platform-specific repository
138
+ configuration, which made Windows port to ignore settings of
139
+ core.hidedotfiles, for example.
140
141
+ cf. <xmqqva0ujboi.fsf@gitster-ct.c.googlers.com>
142
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)
143
402
- In-code comment typofix.
144
+* js/stash-in-c-pathspec-fix (2019-03-08) 2 commits
145
+ - built-in stash: handle :(glob) pathspecs again
146
+ - legacy stash: fix "rudimentary backport of -q"
147
+ (this branch uses ps/stash-in-c; is tangled with tb/stas-in-c-unused-param-fix.)
148
404
- Will merge to 'master'.
149
+ Further fixes to "git stash" reimplemented in C.
150
151
+ Will merge to 'next'.
152
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
153
411
- Doc update.
154
+* nd/rewritten-ref-is-per-worktree (2019-03-08) 3 commits
155
+ - Make sure refs/rewritten/ is per-worktree
156
+ - files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()
157
+ - files-backend.c: factor out per-worktree code in loose_fill_ref_dir()
158
413
- Will merge to 'master'.
159
+ "git rebase" uses the refs/rewritten/ hierarchy to store its
160
+ intermediate states, which inherently makes the hierarchy per
161
+ worktree, but it didn't quite work well.
162
+
163
+ Will merge to 'next'.
164
165
--------------------------------------------------
166
[Stalled]
167
168
+* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
169
+ - add -p: coalesce hunks before testing applicability
170
+
171
+ Applicability check after a patch is edited in a "git add -i/p"
172
+ session has been improved.
173
+
174
+ Will hold.
175
+ cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
176
+
177
+
178
* ds/midx-expire-repack (2019-01-27) 10 commits
179
- midx: add test that 'expire' respects .keep files
180
- multi-pack-index: test expire while adding packs
@@ -494,12 +254,86 @@ of the repositories listed at
254
with '*' in front.
255
256
The top one probably deserves retitling.
497
- The second one is of dubious value, but if we are keeping it,
257
+ The second one is of dubious value, but if we are keeping it,
258
it should also be retitled.
259
260
--------------------------------------------------
261
[Cooking]
262
263
+* br/commit-tree-parseopt (2019-03-08) 1 commit
264
+ (merged to 'next' on 2019-03-11 at e1228ef04f)
265
+ + commit-tree: utilize parse-options api
266
+
267
+ Originally merged to 'next' on 2019-03-08
268
+
269
+ The command line parser of "git commit-tree" has been rewritten to
270
+ use the parse-options API.
271
+
272
+ Will merge to 'master'.
273
+
274
+
275
+* jk/config-type-color-ends-with-lf (2019-03-07) 1 commit
276
+ (merged to 'next' on 2019-03-11 at 810b269d1a)
277
+ + config: document --type=color output is a complete line
278
+
279
+ Originally merged to 'next' on 2019-03-07
280
+
281
+ "git config --type=color ..." is meant to replace "git config --get-color"
282
+ but there is a slight difference that wasn't documented, which is
283
+ now fixed.
284
+
285
+ Will merge to 'master'.
286
+
287
+
288
+* js/remote-curl-i18n (2019-03-06) 1 commit
289
+ - remote-curl: mark all error messages for translation
290
+ (this branch uses js/anonymize-remote-curl-diag.)
291
+
292
+ Error messages given from the http transport have been updated so
293
+ that they can be localized.
294
+
295
+ The i18n of die() messages conflicts with topics in flight, so will
296
+ be dealt with separately when the tree is more quiescent.
297
+
298
+
299
+* ma/asciidoctor-fixes-more (2019-03-07) 5 commits
300
+ - Documentation: turn middle-of-line tabs into spaces
301
+ - git-svn.txt: drop escaping '\' that ends up being rendered
302
+ - git.txt: remove empty line before list continuation
303
+ - config/fsck.txt: avoid starting line with dash
304
+ - config/diff.txt: drop spurious backtick
305
+
306
+ Documentation mark-up fixes.
307
+
308
+ Will merge to 'next'.
309
+
310
+
311
+* nd/diff-parseopt-3 (2019-03-07) 20 commits
312
+ - diff-parseopt: convert --submodule
313
+ - diff-parseopt: convert --ignore-submodules
314
+ - diff-parseopt: convert --textconv
315
+ - diff-parseopt: convert --ext-diff
316
+ - diff-parseopt: convert --quiet
317
+ - diff-parseopt: convert --exit-code
318
+ - diff-parseopt: convert --color-words
319
+ - diff-parseopt: convert --word-diff-regex
320
+ - diff-parseopt: convert --word-diff
321
+ - diff-parseopt: convert --[no-]color
322
+ - diff-parseopt: convert --[no-]follow
323
+ - diff-parseopt: convert -R
324
+ - diff-parseopt: convert -a|--text
325
+ - diff-parseopt: convert --full-index
326
+ - diff-parseopt: convert --binary
327
+ - diff-parseopt: convert --anchored
328
+ - diff-parseopt: convert --diff-algorithm
329
+ - diff-parseopt: convert --histogram
330
+ - diff-parseopt: convert --patience
331
+ - diff-parseopt: convert --[no-]indent-heuristic
332
+
333
+ Third batch to teach the diff machinery to use the parse-options
334
+ API.
335
+
336
+
337
* jt/test-protocol-version (2019-03-07) 8 commits
338
- t5552: compensate for v2 filtering ref adv.
339
- tests: fix protocol version for overspecifications
@@ -515,11 +349,13 @@ of the repositories listed at
349
350
351
* jk/bisect-final-output (2019-03-01) 3 commits
518
- (merged to 'next' on 2019-03-07 at 1d429b237a)
352
+ (merged to 'next' on 2019-03-11 at dea599eb04)
353
+ bisect: make diff-tree output prettier
354
+ bisect: fix internal diff-tree config loading
355
+ bisect: use string arguments to feed internal diff-tree
356
357
+ Originally merged to 'next' on 2019-03-07
358
+
359
The final report from "git bisect" used to show the suspected
360
culprit using a raw "diff-tree", with which there is no output for
361
a merge commit. This has been updated to use a more modern and
@@ -529,10 +365,12 @@ of the repositories listed at
365
366
367
* jk/fsck-doc (2019-03-05) 2 commits
532
- (merged to 'next' on 2019-03-07 at 7826e889a6)
368
+ (merged to 'next' on 2019-03-11 at 5cd610f73e)
369
+ fsck: always compute USED flags for unreachable objects
370
+ doc/fsck: clarify --connectivity-only behavior
371
372
+ Originally merged to 'next' on 2019-03-07
373
+
374
"git fsck --connectivity-only" omits computation necessary to sift
375
the objects that are not reachable from any of the refs into
376
unreachable and dangling. This is now enabled when dangling
@@ -543,10 +381,12 @@ of the repositories listed at
381
382
383
* jk/no-sigpipe-during-network-transport (2019-03-05) 2 commits
546
- (merged to 'next' on 2019-03-07 at 59fe6aa5ac)
384
+ (merged to 'next' on 2019-03-11 at 25900acd0d)
385
+ fetch: ignore SIGPIPE during network operation
386
+ fetch: avoid calling write_or_die()
387
388
+ Originally merged to 'next' on 2019-03-07
389
+
390
On platforms where "git fetch" is killed with SIGPIPE (e.g. OSX),
391
the upload-pack that runs on the other end that hangs up after
392
detecting an error could cause "git fetch" to die with a signal,
@@ -558,9 +398,11 @@ of the repositories listed at
398
399
400
* jk/virtual-objects-do-exist (2019-03-05) 1 commit
561
- (merged to 'next' on 2019-03-07 at d6937e8e46)
401
+ (merged to 'next' on 2019-03-11 at 748c79a1f0)
402
+ rev-list: allow cached objects in existence check
403
404
+ Originally merged to 'next' on 2019-03-07
405
+
406
A recent update broke "is this object available to us?" check for
407
well-known objects like an empty tree (which should yield "yes",
408
even when there is no on-disk object for an empty tree), which has
@@ -576,79 +418,51 @@ of the repositories listed at
418
remote-http transport did not anonymize URLs reported in its error
419
messages at places.
420
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'.
421
+ Will merge to 'next'.
422
423
424
* js/rebase-orig-head-fix (2019-03-04) 4 commits
598
- (merged to 'next' on 2019-03-07 at f805f820b4)
425
+ (merged to 'next' on 2019-03-11 at 4b1b19d391)
426
+ built-in rebase: set ORIG_HEAD just once, before the rebase
427
+ built-in rebase: demonstrate that ORIG_HEAD is not set correctly
428
+ built-in rebase: use the correct reflog when switching branches
429
+ built-in rebase: no need to check out `onto` twice
430
431
+ Originally merged to 'next' on 2019-03-07
432
+
433
"git rebase" that was reimplemented in C did not set ORIG_HEAD
434
correctly, which has been corrected.
435
436
Will merge to 'master'.
437
438
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
-
614
- Docfix.
615
-
616
- Will merge to 'master'.
617
-
618
-
439
* js/stress-test-ui-tweak (2019-03-04) 2 commits
620
- (merged to 'next' on 2019-03-07 at 9b1cc1a73e)
440
+ (merged to 'next' on 2019-03-11 at 223afded1c)
441
+ tests: introduce --stress-jobs=<N>
442
+ tests: let --stress-limit=<N> imply --stress
443
624
- Dev support.
625
-
626
- Will merge to 'master'.
627
-
628
-
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
444
+ Originally merged to 'next' on 2019-03-07
445
446
Dev support.
447
448
Will merge to 'master'.
449
450
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
451
+* ma/asciidoctor-fixes (2019-03-11) 5 commits
452
+ - asciidoctor-extensions: fix spurious space after linkgit in *.html
453
+ - Documentation/Makefile: add missing dependencies on asciidoctor-extensions
454
+ - asciidoctor-extensions: fix spurious space after linkgit
455
+ - Documentation/Makefile: add missing dependency on asciidoctor-extensions
456
+ - Documentation/Makefile: add missing xsl dependencies for manpages
457
458
Build fix around use of asciidoctor instead of asciidoc
459
646
- Will cook in 'next'.
460
+ Ejected out of 'next' to allow a cleaner reroll.
461
462
649
-* nd/worktree-name-sanitization (2019-03-07) 2 commits
463
+* nd/worktree-name-sanitization (2019-03-11) 2 commits
464
+ - SQUASH???
465
- worktree add: sanitize worktree names
651
- - refs.c: refactor check_refname_component()
466
467
In recent versions of Git, per-worktree refs are exposed in
468
refs/worktrees/<wtname>/ hierarchy, which means that worktree names
@@ -656,37 +470,38 @@ of the repositories listed at
470
given to worktrees, to make sure these refs are not malforked.
471
472
659
-* ra/t3600-test-path-funcs (2019-03-04) 3 commits
473
+* ra/t3600-test-path-funcs (2019-03-08) 3 commits
474
- t3600: use helpers to replace test -d/f/e/s <path>
661
- - t3600: restructure code according to contemporary guidelines
475
+ - t3600: modernize style
476
- test functions: add function `test_file_not_empty`
477
478
A GSoC micro.
479
666
- Need to pick up a newer version.
667
-
668
-
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'.
480
+ I think this is almost there.
481
482
483
* dl/reset-doc-no-wrt-abbrev (2019-03-06) 1 commit
484
- git-reset.txt: clarify documentation
485
486
+ Doc update.
487
+
488
+ Will merge to 'next'.
489
+
490
491
* ja/dir-rename-doc-markup-fix (2019-03-06) 1 commit
492
- Doc: fix misleading asciidoc formating
493
494
+ Doc update.
495
+
496
+ Will merge to 'next'.
497
+
498
499
* bp/post-index-change-hook (2019-02-15) 1 commit
687
- (merged to 'next' on 2019-02-23 at 70cc07cebe)
500
+ (merged to 'next' on 2019-03-11 at cb96d1d7c4)
501
+ read-cache: add post-index-change hook
502
503
+ Originally merged to 'next' on 2019-02-23
504
+
505
A new hook "post-index-change" is called when the on-disk index
506
file changes, which can help e.g. a virtualized working tree
507
implementation.
@@ -708,7 +523,7 @@ of the repositories listed at
523
524
525
* ab/makefile-help-devs-more (2019-02-24) 6 commits
711
- (merged to 'next' on 2019-03-07 at fa05e1a2ae)
526
+ (merged to 'next' on 2019-03-11 at 898f5f44bc)
527
+ Makefile: allow for combining DEVELOPER=1 and CFLAGS="..."
528
+ Makefile: move the setting of *FLAGS closer to "include"
529
+ Makefile: Move *_LIBS assignment into its own section
@@ -716,22 +531,23 @@ of the repositories listed at
531
+ Makefile: move "strip" assignment down from flags
532
+ Makefile: remove an out-of-date comment
533
534
+ Originally merged to 'next' on 2019-03-07
535
+
536
CFLAGS now can be tweaked when invoking Make while using
537
DEVELOPER=YesPlease; this did not work well before.
538
722
- Will cook in 'next'.
539
+ Will merge to 'master'.
540
541
725
-* jt/fetch-cdn-offload (2019-03-01) 9 commits
726
- - fixup! upload-pack: refactor reading of pack-objects out
727
- - SQUASH???
542
+* jt/fetch-cdn-offload (2019-03-11) 8 commits
543
- upload-pack: send part of packfile response as uri
544
+ - fetch-pack: support more than one pack lockfile
545
- upload-pack: refactor reading of pack-objects out
546
- Documentation: add Packfile URIs design doc
547
- Documentation: order protocol v2 sections
548
- http-fetch: support fetching packfiles by URL
549
- http: improve documentation of http_pack_request
734
- - http: use --stdin and --keep when downloading pack
550
+ - http: use --stdin when getting dumb HTTP pack
551
552
WIP for allowing a response to "git fetch" to instruct the bulk of
553
the pack contents to be instead taken from elsewhere (aka CDN).
@@ -745,7 +561,7 @@ of the repositories listed at
561
"git submodule" learns "set-branch" subcommand that allows the
562
submodule.*.branch settings to be modified.
563
748
- Need to attach sign-off; other than that it seems OK to be in 'next'.
564
+ Needs sign-off on the tip commit; other than that it seems OK to be in 'next'.
565
566
567
* dm/some-stdio-functions-are-macro-on-freebsd (2019-02-01) 1 commit
@@ -814,22 +630,27 @@ of the repositories listed at
630
631
632
* ma/clear-repository-format (2019-03-01) 2 commits
817
- (merged to 'next' on 2019-03-07 at 4bf5502fe2)
633
+ (merged to 'next' on 2019-03-11 at f3db1c278f)
634
+ setup: fix memory leaks with `struct repository_format`
635
+ setup: free old value before setting `work_tree`
636
637
+ Originally merged to 'next' on 2019-03-07
638
+
639
The setup code has been cleaned up to avoid leaks around the
640
repository_format structure.
641
642
Will merge to 'master'.
643
644
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
830
- + merge: cleanup messages like commit
831
- + t7600: clean up 'merge --squash c3 with c7' test
832
- + commit: extract cleanup_mode functions to sequencer
645
+* dl/merge-cleanup-scissors-fix (2019-03-11) 8 commits
646
+ - cherry-pick/revert: add scissors line on merge conflict
647
+ - sequencer.c: define get_config_from_cleanup
648
+ - merge: add scissors line on merge conflict
649
+ - merge: cleanup messages like commit
650
+ - sequencer.c: remove duplicate code
651
+ - commit: extract cleanup_mode functions to sequencer
652
+ - t3507: cleanup space after redirection operators
653
+ - t7600: clean up 'merge --squash c3 with c7' test
654
655
The list of conflicted paths shown in the editor while concluding a
656
conflicted merge was shown above the scissors line when the
@@ -837,9 +658,7 @@ of the repositories listed at
658
out just like the list of updated paths and other information to
659
help the user explain the merge better.
660
840
- Hold to replace or fixup.
841
- cf. <20190306014143.GA2580@dev-l>
842
- cf. <xmqqpnr3po0g.fsf@gitster-ct.c.googlers.com>
661
+ cf. <cover.1552275703.git.liu.denton@gmail.com>
662
663
664
* jn/unknown-index-extensions (2018-11-21) 2 commits
@@ -880,18 +699,8 @@ of the repositories listed at
699
unnecessarily.
700
701
883
-* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
884
- - add -p: coalesce hunks before testing applicability
885
-
886
- Applicability check after a patch is edited in a "git add -i/p"
887
- session has been improved.
888
-
889
- Will hold.
890
- cf. <e5b2900a-0558-d3bf-8ea1-d526b078bbc2@talktalk.net>
891
-
892
-
702
* ps/stash-in-c (2019-03-07) 29 commits
894
- (merged to 'next' on 2019-03-07 at a2753bc9d4)
703
+ (merged to 'next' on 2019-03-11 at f568e3be72)
704
+ tests: add a special setup where stash.useBuiltin is off
705
+ stash: optionally use the scripted version again
706
+ stash: add back the original, scripted `git stash`
@@ -921,6 +730,9 @@ of the repositories listed at
730
+ strbuf.c: add `strbuf_join_argv()`
731
+ sha1-name.c: add `get_oidf()` which acts like `get_oid()`
732
+ Merge branch 'sd/stash-wo-user-name'
733
+ (this branch is used by js/stash-in-c-pathspec-fix and tb/stas-in-c-unused-param-fix.)
734
+
735
+ Originally merged to 'next' on 2019-03-07
736
737
"git stash" rewritten in C.
738