What's cooking (2018/08 #02)
Junio C Hamano committed
Aug 6, 2018 at 15:33 UTC
91583cdf9020c71892f4b035f9640a7780846a9e
1 file changed
+256
-590
whats-cooking.txt
+256
-590
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Aug 2018, #01; Thu, 2)
3
+Subject: What's cooking in git.git (Aug 2018, #02; Mon, 6)
4
X-master-at: 1d89318c48d233d52f1db230cf622935ac3c69fa
5
-X-next-at: f7a957e2e7d6c0922e75e5f5e5e1a0bb01cfe2bb
5
+X-next-at: 1932418f4676b98c810dd5182aeba50bbd7c02d4
6
7
-What's cooking in git.git (Aug 2018, #01; Thu, 2)
7
+What's cooking in git.git (Aug 2018, #02; Mon, 6)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,449 +12,194 @@ 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
-Many topics have moved to 'master' and 'next' from 'next' to 'pu'
16
-respectively.
17
-
15
You can find the changes described here in the integration branches
16
of the repositories listed at
17
18
http://git-blame.blogspot.com/p/git-public-repositories.html
19
20
--------------------------------------------------
24
-[Graduated to "master"]
25
-
26
-* ab/checkout-default-remote (2018-06-11) 8 commits
27
- (merged to 'next' on 2018-07-24 at 6ef645f485)
28
- + checkout & worktree: introduce checkout.defaultRemote
29
- + checkout: add advice for ambiguous "checkout <branch>"
30
- + builtin/checkout.c: use "ret" variable for return
31
- + checkout: pass the "num_matches" up to callers
32
- + checkout.c: change "unique" member to "num_matches"
33
- + checkout.c: introduce an *_INIT macro
34
- + checkout.h: wrap the arguments to unique_tracking_name()
35
- + checkout tests: index should be clean after dwim checkout
36
- (this branch is used by ab/test-must-be-empty.)
37
-
38
- "git checkout" and "git worktree add" learned to honor
39
- checkout.defaultRemote when auto-vivifying a local branch out of a
40
- remote tracking branch in a repository with multiple remotes that
41
- have tracking branches that share the same names.
42
-
43
-
44
-* bc/object-id (2018-07-16) 16 commits
45
- (merged to 'next' on 2018-07-24 at 23680778a9)
46
- + pretty: switch hard-coded constants to the_hash_algo
47
- + sha1-file: convert constants to uses of the_hash_algo
48
- + log-tree: switch GIT_SHA1_HEXSZ to the_hash_algo->hexsz
49
- + diff: switch GIT_SHA1_HEXSZ to use the_hash_algo
50
- + builtin/merge-recursive: make hash independent
51
- + builtin/merge: switch to use the_hash_algo
52
- + builtin/fmt-merge-msg: make hash independent
53
- + builtin/update-index: simplify parsing of cacheinfo
54
- + builtin/update-index: convert to using the_hash_algo
55
- + refs/files-backend: use the_hash_algo for writing refs
56
- + sha1-name: use the_hash_algo when parsing object names
57
- + strbuf: allocate space with GIT_MAX_HEXSZ
58
- + commit: express tree entry constants in terms of the_hash_algo
59
- + hex: switch to using the_hash_algo
60
- + tree-walk: replace hard-coded constants with the_hash_algo
61
- + cache: update object ID functions for the_hash_algo
62
-
63
- Conversion from uchar[40] to struct object_id continues.
64
-
65
-
66
-* bc/sequencer-export-work-tree-as-well (2018-07-16) 1 commit
67
- (merged to 'next' on 2018-07-24 at 0b83ade721)
68
- + sequencer: pass absolute GIT_WORK_TREE to exec commands
69
-
70
- "git rebase" started exporting GIT_DIR environment variable and
71
- exposing it to hook scripts when part of it got rewritten in C.
72
- Instead of matching the old scripted Porcelains' behaviour,
73
- compensate by also exporting GIT_WORK_TREE environment as well to
74
- lessen the damage. This can harm existing hooks that want to
75
- operate on different repository, but the current behaviour is
76
- already broken for them anyway.
77
-
78
-
79
-* bp/test-drop-caches-for-windows (2018-07-12) 1 commit
80
- (merged to 'next' on 2018-07-24 at 257bb336c6)
81
- + handle lower case drive letters on Windows
82
-
83
- A test helper update for Windows.
84
-
85
-
86
-* ds/commit-graph-fsck (2018-07-16) 23 commits
87
- (merged to 'next' on 2018-07-24 at 6a802adc7a)
88
- + coccinelle: update commit.cocci
89
- + commit-graph: update design document
90
- + gc: automatically write commit-graph files
91
- + commit-graph: add '--reachable' option
92
- + commit-graph: use string-list API for input
93
- + fsck: verify commit-graph
94
- + commit-graph: verify contents match checksum
95
- + commit-graph: test for corrupted octopus edge
96
- + commit-graph: verify commit date
97
- + commit-graph: verify generation number
98
- + commit-graph: verify parent list
99
- + commit-graph: verify root tree OIDs
100
- + commit-graph: verify objects exist
101
- + commit-graph: verify corrupt OID fanout and lookup
102
- + commit-graph: verify required chunks are present
103
- + commit-graph: verify catches corrupt signature
104
- + commit-graph: add 'verify' subcommand
105
- + commit-graph: load a root tree from specific graph
106
- + commit: force commit to parse from object database
107
- + commit-graph: parse commit from chosen graph
108
- + commit-graph: fix GRAPH_MIN_SIZE
109
- + commit-graph: UNLEAK before die()
110
- + t5318-commit-graph.sh: use core.commitGraph
111
- (this branch is used by ds/commit-graph-with-grafts, ds/reachable and jt/commit-graph-per-object-store.)
112
-
113
- "git fsck" learns to make sure the optional commit-graph file is in
114
- a sane state.
115
-
116
-
117
-* en/dirty-merge-fixes (2018-07-11) 9 commits
118
- (merged to 'next' on 2018-07-24 at 7b6ca3507c)
119
- + merge: fix misleading pre-merge check documentation
120
- + merge-recursive: enforce rule that index matches head before merging
121
- + t6044: add more testcases with staged changes before a merge is invoked
122
- + merge-recursive: fix assumption that head tree being merged is HEAD
123
- + merge-recursive: make sure when we say we abort that we actually abort
124
- + t6044: add a testcase for index matching head, when head doesn't match HEAD
125
- + t6044: verify that merges expected to abort actually abort
126
- + index_has_changes(): avoid assuming operating on the_index
127
- + read-cache.c: move index_has_changes() from merge.c
128
-
129
- The recursive merge strategy did not properly ensure there was no
130
- change between HEAD and the index before performing its operation,
131
- which has been corrected.
21
+[New Topics]
22
+
23
+* js/rebase-merges-exec-fix (2018-08-06) 2 commits
24
+ - rebase --exec: make it work with --rebase-merges
25
+ - t3430: demonstrate what -r, --autosquash & --exec should do
26
+
27
+ The "--exec" option to "git rebase --rebase-merges" placed the exec
28
+ commands at wrong places, which has been corrected.
29
+
30
+ cf. <pull.13.v2.git.gitgitgadget@gmail.com>
31
+
32
+
33
+* nd/no-extern (2018-08-03) 12 commits
34
+ - submodule.h: drop extern from function declaration
35
+ - revision.h: drop extern from function declaration
36
+ - repository.h: drop extern from function declaration
37
+ - rerere.h: drop extern from function declaration
38
+ - line-range.h: drop extern from function declaration
39
+ - diff.h: remove extern from function declaration
40
+ - diffcore.h: drop extern from function declaration
41
+ - convert.h: drop 'extern' from function declaration
42
+ - cache-tree.h: drop extern from function declaration
43
+ - blame.h: drop extern on func declaration
44
+ - attr.h: drop extern from function declaration
45
+ - apply.h: drop extern on func declaration
46
+
47
+ Noiseword "extern" has been removed from function decls in the
48
+ header files.
49
+
50
+ Will merge to 'next'.
51
+
52
+
53
+* ar/t4150-am-scissors-test-fix (2018-08-06) 1 commit
54
+ - t4150: fix broken test for am --scissors
55
+
56
+ Test fix.
57
+
58
+ Will merge to 'next'.
59
+
60
+
61
+* en/t3031-title-fix (2018-08-06) 1 commit
62
+ - t3031: update test description to mention desired behavior
63
+
64
+ Test fix.
65
+
66
+ Will merge to 'next'.
67
+
68
+
69
+* hn/config-in-code-comment (2018-08-06) 1 commit
70
+ - config: document git config getter return value
71
+
72
+ Header update.
73
+
74
+ Will merge to 'next'.
75
+
76
+
77
+* jk/diff-rendered-docs (2018-08-06) 1 commit
78
+ - add a script to diff rendered documentation
79
+
80
+ Developer support to allow the end result of documentation update
81
+ to be inspected more easily.
82
+
83
+ Will merge to 'next'.
84
+
85
+
86
+* js/pull-rebase-type-shorthand (2018-08-06) 1 commit
87
+ - pull --rebase=<type>: allow single-letter abbreviations for the type
88
+
89
+ "git pull --rebase=interactive" learned "i" as a short-hand for
90
+ "interactive".
91
+
92
+ Will merge to 'next'.
93
+
94
+
95
+* nd/complete-config-vars (2018-08-06) 1 commit
96
+ - Makefile: add missing dependency for command-list.h
97
+
98
+ Build fix.
99
+
100
+ Will merge to 'next'.
101
+
102
+
103
+* nd/config-blame-sort (2018-08-06) 1 commit
104
+ - config.txt: reorder blame stuff to keep config keys sorted
105
+
106
+ Doc fix.
107
+
108
+ Will merge to 'next'.
109
+
110
+
111
+* wc/make-funnynames-shared-lazy-prereq (2018-08-06) 1 commit
112
+ - t: factor out FUNNYNAMES as shared lazy prereq
113
+
114
+ A test prerequisite defined by various test scripts with slightly
115
+ different sematics has been consolidated into a single copy and
116
+ made into a lazily defined one.
117
118
134
-* en/t6036-merge-recursive-tests (2018-07-11) 6 commits
135
- (merged to 'next' on 2018-07-24 at 75055cb6e1)
136
- + t6036: add a failed conflict detection case: regular files, different modes
137
- + t6036: add a failed conflict detection case with conflicting types
138
- + t6036: add a failed conflict detection case with submodule add/add
139
- + t6036: add a failed conflict detection case with submodule modify/modify
140
- + t6036: add a failed conflict detection case with symlink add/add
141
- + t6036: add a failed conflict detection case with symlink modify/modify
142
-
143
- Tests to cover various conflicting cases have been added for
144
- merge-recursive.
145
-
146
-
147
-* en/t6036-recursive-corner-cases (2018-07-12) 2 commits
148
- (merged to 'next' on 2018-07-24 at b7b3514ef4)
149
- + t6036: fix broken && chain in sub-shell
150
- + t6036: add lots of detail for directory/file conflicts in recursive case
151
-
152
- Tests to cover more D/F conflict cases have been added for
153
- merge-recursive.
154
-
155
-
156
-* en/t6042-insane-merge-rename-testcases (2018-07-03) 3 commits
157
- (merged to 'next' on 2018-07-24 at 65c80f72da)
158
- + t6042: add testcase covering long chains of rename conflicts
159
- + t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
160
- + t6042: add testcase covering rename/add/delete conflict type
161
-
162
- Various glitches in the heuristics of merge-recursive strategy have
163
- been documented in new tests.
164
-
165
- I am not sure if there is a single "correct" answer everybody can
166
- agree on for each of these "insane" cases, though.
167
-
168
-
169
-* en/t7405-recursive-submodule-conflicts (2018-07-11) 3 commits
170
- (merged to 'next' on 2018-07-24 at 6cb7d02298)
171
- + t7405: verify 'merge --abort' works after submodule/path conflicts
172
- + t7405: add a directory/submodule conflict
173
- + t7405: add a file/submodule conflict
174
-
175
- Tests to cover conflict cases that involve submodules have been
176
- added for merge-recursive.
177
-
178
-
179
-* es/chain-lint-in-subshell (2018-07-31) 11 commits
180
- (merged to 'next' on 2018-07-31 at 4ce2a8faa4)
181
- + t/chainlint.sed: drop extra spaces from regex character class
182
- (merged to 'next' on 2018-07-24 at 9370bbdfaf)
183
- + t/chainlint: add chainlint "specialized" test cases
184
- + t/chainlint: add chainlint "complex" test cases
185
- + t/chainlint: add chainlint "cuddled" test cases
186
- + t/chainlint: add chainlint "loop" and "conditional" test cases
187
- + t/chainlint: add chainlint "nested subshell" test cases
188
- + t/chainlint: add chainlint "one-liner" test cases
189
- + t/chainlint: add chainlint "whitespace" test cases
190
- + t/chainlint: add chainlint "basic" test cases
191
- + t/Makefile: add machinery to check correctness of chainlint.sed
192
- + t/test-lib: teach --chain-lint to detect broken &&-chains in subshells
193
- (this branch uses es/test-fixes.)
194
-
195
- Look for broken "&&" chains that are hidden in subshell, many of
196
- which have been found and corrected.
197
-
198
-
199
-* es/test-fixes (2018-07-17) 26 commits
200
- (merged to 'next' on 2018-07-24 at fd6796a3ef)
201
- + t5608: fix broken &&-chain
202
- + t9119: fix broken &&-chains
203
- + t9000-t9999: fix broken &&-chains
204
- + t7000-t7999: fix broken &&-chains
205
- + t6000-t6999: fix broken &&-chains
206
- + t5000-t5999: fix broken &&-chains
207
- + t4000-t4999: fix broken &&-chains
208
- + t3030: fix broken &&-chains
209
- + t3000-t3999: fix broken &&-chains
210
- + t2000-t2999: fix broken &&-chains
211
- + t1000-t1999: fix broken &&-chains
212
- + t0000-t0999: fix broken &&-chains
213
- + t9814: simplify convoluted check that command correctly errors out
214
- + t9001: fix broken "invoke hook" test
215
- + t7810: use test_expect_code() instead of hand-rolled comparison
216
- + t7400: fix broken "submodule add/reconfigure --force" test
217
- + t7201: drop pointless "exit 0" at end of subshell
218
- + t6036: fix broken "merge fails but has appropriate contents" tests
219
- + t5505: modernize and simplify hard-to-digest test
220
- + t5406: use write_script() instead of birthing shell script manually
221
- + t5405: use test_must_fail() instead of checking exit code manually
222
- + t/lib-submodule-update: fix "absorbing" test
223
- + t: drop unnecessary terminating semicolon in subshell
224
- + t: use sane_unset() rather than 'unset' with broken &&-chain
225
- + t: use test_write_lines() instead of series of 'echo' commands
226
- + t: use test_might_fail() instead of manipulating exit code manually
227
- (this branch is used by es/chain-lint-in-subshell.)
228
-
229
- Test clean-up and corrections.
230
-
231
-
232
-* is/parsing-line-range (2018-06-15) 2 commits
233
- (merged to 'next' on 2018-07-24 at a06b453f32)
234
- + log: prevent error if line range ends past end of file
235
- + blame: prevent error if range ends past end of file
236
-
237
- Parsing of -L[<N>][,[<M>]] parameters "git blame" and "git log"
238
- take has been tweaked.
239
-
240
-
241
-* jk/fsck-gitmodules-gently (2018-07-16) 6 commits
242
- (merged to 'next' on 2018-07-24 at 5b15c800db)
243
- + fsck: downgrade gitmodulesParse default to "info"
244
- + fsck: split ".gitmodules too large" error from parse failure
245
- + fsck: silence stderr when parsing .gitmodules
246
- + config: add options parameter to git_config_from_mem
247
- + config: add CONFIG_ERROR_SILENT handler
248
- + config: turn die_on_error into caller-facing enum
249
-
250
- Recent "security fix" to pay attention to contents of ".gitmodules"
251
- while accepting "git push" was a bit overly strict than necessary,
252
- which has been adjusted.
253
-
254
-
255
-* jk/has-uncommitted-changes-fix (2018-07-11) 1 commit
256
- (merged to 'next' on 2018-07-24 at 2ea14c0afb)
257
- + has_uncommitted_changes(): fall back to empty tree
258
-
259
- "git pull --rebase" on a corrupt HEAD caused a segfault. In
260
- general we substitute an empty tree object when running the in-core
261
- equivalent of the diff-index command, and the codepath has been
262
- corrected to do so as well to fix this issue.
263
-
264
-
265
-* jm/cache-entry-from-mem-pool (2018-07-03) 8 commits
266
- (merged to 'next' on 2018-07-24 at 9be51a88dc)
267
- + block alloc: add validations around cache_entry lifecyle
268
- + block alloc: allocate cache entries from mem_pool
269
- + mem-pool: fill out functionality
270
- + mem-pool: add life cycle management functions
271
- + mem-pool: only search head block for available space
272
- + block alloc: add lifecycle APIs for cache_entry structs
273
- + read-cache: teach make_cache_entry to take object_id
274
- + read-cache: teach refresh_cache_entry to take istate
275
-
276
- For a large tree, the index needs to hold many cache entries
277
- allocated on heap. These cache entries are now allocated out of a
278
- dedicated memory pool to amortize malloc(3) overhead.
279
-
280
- This makes each cache-entry larger by either 4 or 8 bytes, which is
281
- a bit sad, though.
282
-
283
-
284
-* jm/send-email-tls-auth-on-batch (2018-07-16) 1 commit
285
- (merged to 'next' on 2018-07-24 at fb3e653f44)
286
- + send-email: fix tls AUTH when sending batch
287
-
288
- "git send-email" when using in a batched mode that limits the
289
- number of messages sent in a single SMTP session lost the contents
290
- of the variable used to choose between tls/ssl, unable to send the
291
- second and later batches, which has been fixed.
292
-
293
- This is marked to be merged to 'next' already, but I do not mind
294
- getting an updated version with an improved log message before that
295
- happens.
296
-
297
-
298
-* js/rebase-merge-octopus (2018-07-11) 3 commits
299
- (merged to 'next' on 2018-07-24 at 14ad8699de)
300
- + rebase --rebase-merges: adjust man page for octopus support
301
- + rebase --rebase-merges: add support for octopus merges
302
- + merge: allow reading the merge commit message from a file
303
-
304
- "git rebase --rebase-merges" mode now handles octopus merges as
305
- well.
306
-
307
-
308
-* jt/commit-graph-per-object-store (2018-07-17) 7 commits
309
- (merged to 'next' on 2018-07-24 at 090d1a4d59)
310
- + commit-graph: add repo arg to graph readers
311
- + commit-graph: store graph in struct object_store
312
- + commit-graph: add free_commit_graph
313
- + commit-graph: add missing forward declaration
314
- + object-store: add missing include
315
- + commit-graph: refactor preparing commit graph
316
- + Merge branch 'ds/commit-graph-fsck' into jt/commit-graph-per-object-store
317
- (this branch is used by ds/commit-graph-with-grafts and ds/reachable; uses ds/commit-graph-fsck and sb/object-store-lookup.)
318
-
319
- The singleton commit-graph in-core instance is made per in-core
320
- repository instance.
321
-
322
-
323
-* jt/fetch-nego-tip (2018-07-03) 1 commit
324
- (merged to 'next' on 2018-07-24 at a9e299006d)
325
- + fetch-pack: support negotiation tip whitelist
326
- (this branch is used by ab/fetch-nego; uses jt/fetch-pack-negotiator; is tangled with jt/fetch-negotiator-skipping.)
327
-
328
- "git fetch" learned a new option "--negotiation-tip" to limit the
329
- set of commits it tells the other end as "have", to reduce wasted
330
- bandwidth and cycles, which would be helpful when the receiving
331
- repository has a lot of refs that have little to do with the
332
- history at the remote it is fetching from.
333
-
334
-
335
-* jt/fetch-negotiator-skipping (2018-07-16) 1 commit
336
- (merged to 'next' on 2018-07-24 at 8e25a49405)
337
- + negotiator/skipping: skip commits during fetch
338
- (this branch is used by ab/fetch-nego; uses jt/fetch-pack-negotiator; is tangled with jt/fetch-nego-tip.)
339
-
340
- Add a server-side knob to skip commits in exponential/fibbonacci
341
- stride in an attempt to cover wider swath of history with a smaller
342
- number of iterations, potentially accepting a larger packfile
343
- transfer, instead of going back one commit a time during common
344
- ancestor discovery during the "git fetch" transaction.
345
-
346
-
347
-* jt/fetch-pack-negotiator (2018-06-15) 7 commits
348
- (merged to 'next' on 2018-07-24 at 438efcd6b1)
349
- + fetch-pack: introduce negotiator API
350
- + fetch-pack: move common check and marking together
351
- + fetch-pack: make negotiation-related vars local
352
- + fetch-pack: use ref adv. to prune "have" sent
353
- + fetch-pack: directly end negotiation if ACK ready
354
- + fetch-pack: clear marks before re-marking
355
- + fetch-pack: split up everything_local()
356
- (this branch is used by ab/fetch-nego, jt/fetch-nego-tip and jt/fetch-negotiator-skipping.)
357
-
358
- Code restructuring and a small fix to transport protocol v2 during
359
- fetching.
360
-
361
-
362
-* jt/tags-to-promised-blobs-fix (2018-07-16) 2 commits
363
- (merged to 'next' on 2018-07-24 at 8d7e78a671)
364
- + tag: don't warn if target is missing but promised
365
- + revision: tolerate promised targets of tags
366
-
367
- The lazy clone support had a few places where missing but promised
368
- objects were not correctly tolerated, which have been fixed.
369
-
370
-
371
-* kg/gc-auto-windows-workaround (2018-07-09) 1 commit
372
- (merged to 'next' on 2018-07-24 at 71c05d27b6)
373
- + gc --auto: release pack files before auto packing
374
-
375
- "git gc --auto" opens file descriptors for the packfiles before
376
- spawning "git repack/prune", which would upset Windows that does
377
- not want a process to work on a file that is open by another
378
- process. The issue has been worked around.
379
-
380
-
381
-* sb/diff-color-move-more (2018-07-19) 10 commits
382
- (merged to 'next' on 2018-07-24 at 89c893cab2)
383
- + diff.c: offer config option to control ws handling in move detection
384
- + diff.c: add white space mode to move detection that allows indent changes
385
- + diff.c: factor advance_or_nullify out of mark_color_as_moved
386
- + diff.c: decouple white space treatment from move detection algorithm
387
- + diff.c: add a blocks mode for moved code detection
388
- + diff.c: adjust hash function signature to match hashmap expectation
389
- + diff.c: do not pass diff options as keydata to hashmap
390
- + t4015: avoid git as a pipe input
391
- + xdiff/xdiffi.c: remove unneeded function declarations
392
- + xdiff/xdiff.h: remove unused flags
393
-
394
- "git diff --color-moved" feature has further been tweaked.
395
-
396
-
397
-* sb/object-store-lookup (2018-06-29) 33 commits
398
- (merged to 'next' on 2018-07-24 at dd96e29376)
399
- + commit.c: allow lookup_commit_reference to handle arbitrary repositories
400
- + commit.c: allow lookup_commit_reference_gently to handle arbitrary repositories
401
- + tag.c: allow deref_tag to handle arbitrary repositories
402
- + object.c: allow parse_object to handle arbitrary repositories
403
- + object.c: allow parse_object_buffer to handle arbitrary repositories
404
- + commit.c: allow get_cached_commit_buffer to handle arbitrary repositories
405
- + commit.c: allow set_commit_buffer to handle arbitrary repositories
406
- + commit.c: migrate the commit buffer to the parsed object store
407
- + commit-slabs: remove realloc counter outside of slab struct
408
- + commit.c: allow parse_commit_buffer to handle arbitrary repositories
409
- + tag: allow parse_tag_buffer to handle arbitrary repositories
410
- + tag: allow lookup_tag to handle arbitrary repositories
411
- + commit: allow lookup_commit to handle arbitrary repositories
412
- + tree: allow lookup_tree to handle arbitrary repositories
413
- + blob: allow lookup_blob to handle arbitrary repositories
414
- + object: allow lookup_object to handle arbitrary repositories
415
- + object: allow object_as_type to handle arbitrary repositories
416
- + tag: add repository argument to deref_tag
417
- + tag: add repository argument to parse_tag_buffer
418
- + tag: add repository argument to lookup_tag
419
- + commit: add repository argument to get_cached_commit_buffer
420
- + commit: add repository argument to set_commit_buffer
421
- + commit: add repository argument to parse_commit_buffer
422
- + commit: add repository argument to lookup_commit
423
- + commit: add repository argument to lookup_commit_reference
424
- + commit: add repository argument to lookup_commit_reference_gently
425
- + tree: add repository argument to lookup_tree
426
- + blob: add repository argument to lookup_blob
427
- + object: add repository argument to object_as_type
428
- + object: add repository argument to parse_object_buffer
429
- + object: add repository argument to lookup_object
430
- + object: add repository argument to parse_object
431
- + Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
432
- (this branch is used by ds/commit-graph-with-grafts, ds/reachable and jt/commit-graph-per-object-store.)
433
-
434
- lookup_commit_reference() and friends have been updated to find
435
- in-core object for a specific in-core repository instance.
436
-
437
-
438
-* sg/httpd-test-unflake (2018-07-12) 3 commits
439
- (merged to 'next' on 2018-07-24 at b7df820256)
440
- + t/lib-httpd: avoid occasional failures when checking access.log
441
- + t/lib-httpd: add the strip_access_log() helper function
442
- + t5541: clean up truncating access log
443
-
444
- httpd tests saw occasional breakage due to the way its access log
445
- gets inspected by the tests, which has been updated to make them
446
- less flaky.
447
-
448
-
449
-* tb/grep-only-matching (2018-07-09) 2 commits
450
- (merged to 'next' on 2018-07-24 at 7e878b9d95)
451
- + grep.c: teach 'git grep --only-matching'
452
- + grep.c: extract show_line_header()
453
-
454
- "git grep" learned the "--only-matching" option.
119
120
--------------------------------------------------
457
-[New Topics]
121
+[Stalled]
122
+
123
+* ma/wrapped-info (2018-05-28) 2 commits
124
+ - usage: prefix all lines in `vreportf()`, not just the first
125
+ - usage: extract `prefix_suffix_lines()` from `advise()`
126
+
127
+ An attempt to help making multi-line messages fed to warning(),
128
+ error(), and friends more easily translatable.
129
+
130
+ Will discard and wait for a cleaned-up rewrite.
131
+ cf. <20180529213957.GF7964@sigill.intra.peff.net>
132
+
133
+
134
+* hn/bisect-first-parent (2018-04-21) 1 commit
135
+ - bisect: create 'bisect_flags' parameter in find_bisection()
136
+
137
+ Preliminary code update to allow passing more flags down the
138
+ bisection codepath in the future.
139
+
140
+ We do not add random code that does not have real users to our
141
+ codebase, so let's have it wait until such a real code materializes
142
+ before too long.
143
+
144
+
145
+* av/fsmonitor-updates (2018-01-04) 6 commits
146
+ - fsmonitor: use fsmonitor data in `git diff`
147
+ - fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
148
+ - fsmonitor: make output of test-dump-fsmonitor more concise
149
+ - fsmonitor: update helper tool, now that flags are filled later
150
+ - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
151
+ - dir.c: update comments to match argument name
152
+
153
+ Code clean-up on fsmonitor integration, plus optional utilization
154
+ of the fsmonitor data in diff-files.
155
+
156
+ Waiting for an update.
157
+ cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
158
+
159
+
160
+* pb/bisect-helper-2 (2018-07-23) 8 commits
161
+ - t6030: make various test to pass GETTEXT_POISON tests
162
+ - bisect--helper: `bisect_start` shell function partially in C
163
+ - bisect--helper: `get_terms` & `bisect_terms` shell function in C
164
+ - bisect--helper: `bisect_next_check` shell function in C
165
+ - bisect--helper: `check_and_set_terms` shell function in C
166
+ - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
167
+ - bisect--helper: `bisect_write` shell function in C
168
+ - bisect--helper: `bisect_reset` shell function in C
169
+
170
+ Expecting a reroll.
171
+ cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
172
+
173
+ I just rebased the topic to a newer base as it did not build
174
+ standalone with the base I originally queued the topic on, but
175
+ otherwise there is no update to address any of the review comments
176
+ in the thread above---we are still waiting for a reroll.
177
+
178
+
179
+* jk/drop-ancient-curl (2017-08-09) 5 commits
180
+ - http: #error on too-old curl
181
+ - curl: remove ifdef'd code never used with curl >=7.19.4
182
+ - http: drop support for curl < 7.19.4
183
+ - http: drop support for curl < 7.16.0
184
+ - http: drop support for curl < 7.11.1
185
+
186
+ Some code in http.c that has bitrot is being removed.
187
+
188
+ Expecting a reroll.
189
+
190
+
191
+* mk/use-size-t-in-zlib (2017-08-10) 1 commit
192
+ . zlib.c: use size_t for size
193
+
194
+ The wrapper to call into zlib followed our long tradition to use
195
+ "unsigned long" for sizes of regions in memory, which have been
196
+ updated to use "size_t".
197
+
198
+ Needs resurrecting by making sure the fix is good and still applies
199
+ (or adjusted to today's codebase).
200
+
201
+--------------------------------------------------
202
+[Cooking]
203
204
* ab/fsck-transfer-updates (2018-07-27) 10 commits
205
- fsck: test and document unknown fsck.<msg-id> values
@@ -494,12 +239,13 @@ of the repositories listed at
239
240
241
* cb/p4-pre-submit-hook (2018-08-01) 1 commit
497
- - git-p4: add the `p4-pre-submit` hook
242
+ (merged to 'next' on 2018-08-06 at e40ae4af80)
243
+ + git-p4: add the `p4-pre-submit` hook
244
245
"git p4 submit" learns to ask its own pre-submit hook if it should
246
continue with submitting.
247
502
- Will merge to 'next'.
248
+ Will merge to 'master'.
249
250
251
* es/rebase-i-author-script-fix (2018-07-31) 4 commits
@@ -516,36 +262,40 @@ of the repositories listed at
262
Will merge to 'next'.
263
264
519
-* hn/highlight-sideband-keywords (2018-07-31) 1 commit
520
- - sideband: highlight keywords in remote output
265
+* hn/highlight-sideband-keywords (2018-08-06) 2 commits
266
+ - SQUASH???
267
+ - sideband: highlight keywords in remote sideband output
268
269
The sideband code learned to optionally paint selected keywords at
270
the beginning of incoming lines on the receiving end.
271
272
273
* jn/subtree-test-fixes (2018-07-30) 2 commits
527
- - subtree test: simplify preparation of expected results
528
- - subtree test: add missing && to &&-chain
274
+ (merged to 'next' on 2018-08-06 at 62f21c328f)
275
+ + subtree test: simplify preparation of expected results
276
+ + subtree test: add missing && to &&-chain
277
278
Test fix.
279
532
- Will merge to 'next'.
280
+ Will merge to 'master'.
281
282
283
* ms/http-proto-doc (2018-07-30) 1 commit
536
- - doc: fix want-capability separator
284
+ (merged to 'next' on 2018-08-06 at df1cac9945)
285
+ + doc: fix want-capability separator
286
287
Doc fix.
288
540
- Will merge to 'next'.
289
+ Will merge to 'master'.
290
291
292
* nd/pack-objects-threading-doc (2018-07-30) 1 commit
544
- - pack-objects: document about thread synchronization
293
+ (merged to 'next' on 2018-08-06 at cc8c305191)
294
+ + pack-objects: document about thread synchronization
295
296
Doc fix.
297
548
- Will merge to 'next'.
298
+ Will merge to 'master'.
299
300
301
* sb/indent-heuristic-optim (2018-08-01) 1 commit
@@ -599,11 +349,12 @@ of the repositories listed at
349
350
351
* es/mw-to-git-chain-fix (2018-07-31) 1 commit
602
- - mw-to-git/t9360: fix broken &&-chain
352
+ (merged to 'next' on 2018-08-06 at c10246e1c8)
353
+ + mw-to-git/t9360: fix broken &&-chain
354
355
Test fix.
356
606
- Will merge to 'next'.
357
+ Will merge to 'master'.
358
359
360
* jk/merge-subtree-heuristics (2018-08-02) 1 commit
@@ -615,15 +366,6 @@ of the repositories listed at
366
Will merge to 'next'.
367
368
618
-* jt/connectivity-check-after-unshallow (2018-08-01) 1 commit
619
- - fetch-pack: unify ref in and out param
620
-
621
- Recent update to the transport layer broke ref updates after "git
622
- fetch", which is now fixed.
623
-
624
- Will merge to 'next'.
625
-
626
-
369
* jt/refspec-dwim-precedence-fix (2018-08-02) 1 commit
370
- remote: make refspec follow the same disambiguation rule as local refs
371
@@ -653,11 +395,11 @@ of the repositories listed at
395
cf. <xmqq1sbh7phx.fsf@gitster-ct.c.googlers.com>
396
397
656
-* nd/unpack-trees-with-cache-tree (2018-07-31) 4 commits
398
+* nd/unpack-trees-with-cache-tree (2018-08-06) 4 commits
399
- unpack-trees: cheaper index update when walking by cache-tree
400
- unpack-trees: reduce malloc in cache-tree walk
401
- unpack-trees: optimize walking same trees with cache-tree
660
- - unpack-trees.c: add performance tracing
402
+ - unpack-trees: add performance tracing
403
404
The unpack_trees() API used in checking out a branch and merging
405
walks one or more trees along with the index. When the cache-tree
@@ -669,11 +411,12 @@ of the repositories listed at
411
412
413
* rs/remote-mv-leakfix (2018-08-01) 1 commit
672
- - remote: clear string_list after use in mv()
414
+ (merged to 'next' on 2018-08-06 at 999fe6d3e5)
415
+ + remote: clear string_list after use in mv()
416
417
Leakfix.
418
676
- Will merge to 'next'.
419
+ Will merge to 'master'.
420
421
422
* sb/config-write-fix (2018-08-01) 3 commits
@@ -684,8 +427,8 @@ of the repositories listed at
427
Recent update to "git config" broke updating variable in a
428
subsection, which has been corrected.
429
687
- Not quite?
688
- cf. <xmqq4lgc1rbv.fsf@gitster-ct.c.googlers.com>
430
+ Expecting a reroll.
431
+ cf. <CAGZ79kZ1R8sxmtfgPOQcpoWM7GWV1qiRaqMq_zhGyKBB3ARLjg@mail.gmail.com>
432
433
434
* sb/range-diff-colors (2018-08-01) 9 commits
@@ -708,21 +451,23 @@ of the repositories listed at
451
452
453
* sg/travis-retrieve-trash-upon-failure (2018-08-01) 1 commit
711
- - travis-ci: include the trash directories of failed tests in the trace log
454
+ (merged to 'next' on 2018-08-06 at d67def2a92)
455
+ + travis-ci: include the trash directories of failed tests in the trace log
456
457
The Travis CI scripts were taught to ship back the test data from
458
failed tests.
459
716
- Will merge to 'next'.
460
+ Will merge to 'master'.
461
462
719
-* jt/fetch-follow-fix (2018-08-01) 1 commit
720
- - fetch-pack: unify ref in and out param
463
+* jt/connectivity-check-after-unshallow (2018-08-01) 1 commit
464
+ (merged to 'next' on 2018-08-06 at 1932418f46)
465
+ + fetch-pack: unify ref in and out param
466
467
"git fetch" sometimes failed to update the remote-tracking refs,
468
which has been corrected.
469
725
- Will merge to 'next'.
470
+ Will merge to 'master'.
471
472
473
* ab/sha1dc (2018-08-02) 1 commit
@@ -733,8 +478,8 @@ of the repositories listed at
478
Will merge to 'next'.
479
480
736
-* es/want-color-fd-defensive (2018-08-02) 1 commit
737
- - color: protect against out-of-bounds array access/assignment
481
+* es/want-color-fd-defensive (2018-08-03) 1 commit
482
+ - color: protect against out-of-bounds reads and writes
483
484
Futureproofing a helper function that can easily misused.
485
@@ -755,13 +500,14 @@ of the repositories listed at
500
script written by bad writer" approach?
501
502
758
-* rs/parse-opt-lithelp (2018-08-02) 6 commits
503
+* rs/parse-opt-lithelp (2018-08-03) 7 commits
504
- parse-options: automatically infer PARSE_OPT_LITERAL_ARGHELP
505
- shortlog: correct option help for -w
506
- send-pack: specify --force-with-lease argument help explicitly
507
- pack-objects: specify --index-version argument help explicitly
508
- difftool: remove angular brackets from argument help
509
- add, update-index: fix --chmod argument help
510
+ - push: use PARSE_OPT_LITERAL_ARGHELP instead of unbalanced brackets
511
512
The parse-options machinery learned to refrain from enclosing
513
placeholder string inside a "<bra" and "ket>" pair automatically
@@ -771,88 +517,6 @@ of the repositories listed at
517
518
Will merge to 'next'.
519
774
---------------------------------------------------
775
-[Stalled]
776
-
777
-* ma/wrapped-info (2018-05-28) 2 commits
778
- - usage: prefix all lines in `vreportf()`, not just the first
779
- - usage: extract `prefix_suffix_lines()` from `advise()`
780
-
781
- An attempt to help making multi-line messages fed to warning(),
782
- error(), and friends more easily translatable.
783
-
784
- Will discard and wait for a cleaned-up rewrite.
785
- cf. <20180529213957.GF7964@sigill.intra.peff.net>
786
-
787
-* hn/bisect-first-parent (2018-04-21) 1 commit
788
- - bisect: create 'bisect_flags' parameter in find_bisection()
789
-
790
- Preliminary code update to allow passing more flags down the
791
- bisection codepath in the future.
792
-
793
- We do not add random code that does not have real users to our
794
- codebase, so let's have it wait until such a real code materializes
795
- before too long.
796
-
797
-
798
-* av/fsmonitor-updates (2018-01-04) 6 commits
799
- - fsmonitor: use fsmonitor data in `git diff`
800
- - fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh
801
- - fsmonitor: make output of test-dump-fsmonitor more concise
802
- - fsmonitor: update helper tool, now that flags are filled later
803
- - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
804
- - dir.c: update comments to match argument name
805
-
806
- Code clean-up on fsmonitor integration, plus optional utilization
807
- of the fsmonitor data in diff-files.
808
-
809
- Waiting for an update.
810
- cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>
811
-
812
-
813
-* pb/bisect-helper-2 (2018-07-23) 8 commits
814
- - t6030: make various test to pass GETTEXT_POISON tests
815
- - bisect--helper: `bisect_start` shell function partially in C
816
- - bisect--helper: `get_terms` & `bisect_terms` shell function in C
817
- - bisect--helper: `bisect_next_check` shell function in C
818
- - bisect--helper: `check_and_set_terms` shell function in C
819
- - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
820
- - bisect--helper: `bisect_write` shell function in C
821
- - bisect--helper: `bisect_reset` shell function in C
822
-
823
- Expecting a reroll.
824
- cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
825
-
826
- I just rebased the topic to a newer base as it did not build
827
- standalone with the base I originally queued the topic on, but
828
- otherwise there is no update to address any of the review comments
829
- in the thread above---we are still waiting for a reroll.
830
-
831
-
832
-* jk/drop-ancient-curl (2017-08-09) 5 commits
833
- - http: #error on too-old curl
834
- - curl: remove ifdef'd code never used with curl >=7.19.4
835
- - http: drop support for curl < 7.19.4
836
- - http: drop support for curl < 7.16.0
837
- - http: drop support for curl < 7.11.1
838
-
839
- Some code in http.c that has bitrot is being removed.
840
-
841
- Expecting a reroll.
842
-
843
-
844
-* mk/use-size-t-in-zlib (2017-08-10) 1 commit
845
- . zlib.c: use size_t for size
846
-
847
- The wrapper to call into zlib followed our long tradition to use
848
- "unsigned long" for sizes of regions in memory, which have been
849
- updated to use "size_t".
850
-
851
- Needs resurrecting by making sure the fix is good and still applies
852
- (or adjusted to today's codebase).
853
-
854
---------------------------------------------------
855
-[Cooking]
520
521
* es/diff-color-moved-fix (2018-07-25) 1 commit
522
(merged to 'next' on 2018-08-02 at 233bccfbfb)
@@ -875,8 +539,8 @@ of the repositories listed at
539
individual added/removed lines to be used in the operation, instead
540
of accepting or rejecting a whole hunk.
541
878
- Will merge to and cook in 'next'.
879
-
542
+ Will hold.
543
+ cf. <d622a95b-7302-43d4-4ec9-b2cf3388c653@talktalk.net>
544
I found the feature to be hard to explain, and may result in more
545
end-user complaints, but let's see.
546
@@ -912,7 +576,7 @@ of the repositories listed at
576
based on its use (and updating existing commit-graph) when these
577
incompatible features are in use in the repository.
578
915
- Will merge to 'master'.
579
+ Will cook in 'next'.
580
581
582
* jk/core-use-replace-refs (2018-07-18) 3 commits
@@ -1041,8 +705,9 @@ of the repositories listed at
705
706
707
* en/merge-recursive-skip-fix (2018-07-27) 2 commits
1044
- - merge-recursive: preserve skip_worktree bit when necessary
1045
- - t3507: add a testcase showing failure with sparse checkout
708
+ (merged to 'next' on 2018-08-06 at 9ab321a15c)
709
+ + merge-recursive: preserve skip_worktree bit when necessary
710
+ + t3507: add a testcase showing failure with sparse checkout
711
712
When the sparse checkout feature is in use, "git cherry-pick" and
713
other mergy operations lost the skip_worktree bit when a path that
@@ -1052,7 +717,7 @@ of the repositories listed at
717
deleted. This has been corrected by preserving the skip_worktree
718
bit (and not materializing the file in the working tree).
719
1055
- Will merge to 'next'.
720
+ Will merge to 'master'.
721
722
723
* es/format-patch-interdiff (2018-07-23) 6 commits
@@ -1093,17 +758,18 @@ of the repositories listed at
758
759
760
* jk/banned-function (2018-07-26) 5 commits
1096
- - banned.h: mark strncpy() as banned
1097
- - banned.h: mark sprintf() as banned
1098
- - banned.h: mark strcat() as banned
1099
- - automatically ban strcpy()
1100
- - Merge branch 'sb/blame-color' into jk/banned-function
761
+ (merged to 'next' on 2018-08-06 at 3dcd1999df)
762
+ + banned.h: mark strncpy() as banned
763
+ + banned.h: mark sprintf() as banned
764
+ + banned.h: mark strcat() as banned
765
+ + automatically ban strcpy()
766
+ + Merge branch 'sb/blame-color' into jk/banned-function
767
768
It is too easy to misuse system API functions such as strcat();
769
these selected functions are now forbidden in this codebase and
770
will cause a compilation failure.
771
1106
- Will merge to 'next'.
772
+ Will merge to 'master'.
773
774
775
* jk/size-t (2018-07-24) 6 commits
@@ -1130,20 +796,21 @@ of the repositories listed at
796
797
798
* js/vscode (2018-07-30) 9 commits
1133
- - vscode: let cSpell work on commit messages, too
1134
- - vscode: add a dictionary for cSpell
1135
- - vscode: use 8-space tabs, no trailing ws, etc for Git's source code
1136
- - vscode: wrap commit messages at column 72 by default
1137
- - vscode: only overwrite C/C++ settings
1138
- - mingw: define WIN32 explicitly
1139
- - cache.h: extract enum declaration from inside a struct declaration
1140
- - vscode: hard-code a couple defines
1141
- - contrib: add a script to initialize VS Code configuration
799
+ (merged to 'next' on 2018-08-06 at 5c578b63a8)
800
+ + vscode: let cSpell work on commit messages, too
801
+ + vscode: add a dictionary for cSpell
802
+ + vscode: use 8-space tabs, no trailing ws, etc for Git's source code
803
+ + vscode: wrap commit messages at column 72 by default
804
+ + vscode: only overwrite C/C++ settings
805
+ + mingw: define WIN32 explicitly
806
+ + cache.h: extract enum declaration from inside a struct declaration
807
+ + vscode: hard-code a couple defines
808
+ + contrib: add a script to initialize VS Code configuration
809
810
Add a script (in contrib/) to help users of VSCode work better with
811
our codebase.
812
1146
- Will merge to 'next'.
813
+ Will merge to 'master'.
814
815
816
* jt/tag-following-with-proto-v2-fix (2018-07-24) 2 commits
@@ -1214,21 +881,22 @@ of the repositories listed at
881
Will merge to 'master'.
882
883
1217
-* ab/newhash-is-sha256 (2018-07-26) 2 commits
884
+* ab/newhash-is-sha256 (2018-08-06) 2 commits
885
- doc hash-function-transition: pick SHA-256 as NewHash
886
- doc hash-function-transition: note the lack of a changelog
887
888
Documentation update.
889
1223
- Will merge to 'next'.
890
+ Will Merge to 'next'.
891
892
893
* bb/redecl-enum-fix (2018-07-26) 1 commit
1227
- - packfile: ensure that enum object_type is defined
894
+ (merged to 'next' on 2018-08-06 at 828dc4b156)
895
+ + packfile: ensure that enum object_type is defined
896
897
Compilation fix.
898
1231
- Will merge to 'next'.
899
+ Will merge to 'master'.
900
901
902
* jh/structured-logging (2018-07-25) 25 commits
@@ -1308,8 +976,9 @@ of the repositories listed at
976
cf. <20180717201348.GD26218@sigill.intra.peff.net>
977
978
1311
-* sb/submodule-update-in-c (2018-07-18) 6 commits
979
+* sb/submodule-update-in-c (2018-08-03) 7 commits
980
- submodule--helper: introduce new update-module-mode helper
981
+ - submodule--helper: replace connect-gitdir-workingtree by ensure-core-worktree
982
- builtin/submodule--helper: factor out method to update a single submodule
983
- builtin/submodule--helper: store update_clone information in a struct
984
- builtin/submodule--helper: factor out submodule updating
@@ -1318,7 +987,7 @@ of the repositories listed at
987
988
"git submodule update" is getting rewritten piece-by-piece into C.
989
1321
- Will merge to 'next'.
990
+ Will merge to and cook in 'next'.
991
992
993
* sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits
@@ -1334,13 +1003,13 @@ of the repositories listed at
1003
Seems to break 7512, 3404 and 7060 in 'pu'.
1004
1005
1337
-* tg/rerere (2018-07-16) 11 commits
1006
+* tg/rerere (2018-08-06) 11 commits
1007
- rerere: recalculate conflict ID when unresolved conflict is committed
1008
- rerere: teach rerere to handle nested conflicts
1009
- rerere: return strbuf from handle path
1010
- rerere: factor out handle_conflict function
1011
- rerere: only return whether a path has conflicts or not
1343
- - rerere: fix crash when conflict goes unresolved
1012
+ - rerere: fix crash with files rerere can't handle
1013
- rerere: add documentation for conflict normalization
1014
- rerere: mark strings for translation
1015
- rerere: wrap paths in output in sq
@@ -1350,7 +1019,7 @@ of the repositories listed at
1019
Fixes to "git rerere" corner cases, especially when conflict
1020
markers cannot be parsed in the file.
1021
1353
- I am not sure about the "nested" stuff, though.
1022
+ Will merge to and cook in 'next'.
1023
1024
1025
* jk/ui-color-always-to-auto (2018-07-18) 1 commit
@@ -1457,22 +1126,20 @@ of the repositories listed at
1126
Will merge to 'next'.
1127
1128
1460
-* pk/rebase-in-c (2018-07-30) 3 commits
1129
+* pk/rebase-in-c (2018-08-06) 3 commits
1130
- builtin/rebase: support running "git rebase <upstream>"
1131
- rebase: refactor common shell functions into their own file
1132
- rebase: start implementing it as a builtin
1133
1134
Rewrite of the "rebase" machinery in C.
1135
1467
- Will merge to 'next'.
1468
-
1136
1137
* jk/branch-l-1-repurpose (2018-06-22) 1 commit
1138
- branch: make "-l" a synonym for "--list"
1139
1140
Updated plan to repurpose the "-l" option to "git branch".
1141
1475
- Will hold in 'pu' until jk/branch-l-0-deprecation progresses sufficiently.
1142
+ Will merge to and cook in 'next'.
1143
1144
1145
* cc/remote-odb (2018-08-02) 9 commits
@@ -1530,7 +1197,6 @@ of the repositories listed at
1197
1198
Will merge to and cook in 'next'.
1199
1533
-
1200
--------------------------------------------------
1201
[Discarded]
1202