What's cooking (2018/10 #02)
Junio C Hamano committed
Oct 12, 2018 at 23:41 UTC
244b14fc315c5e407f605683b2ea5c42c8553e7f
1 file changed
+449
-421
whats-cooking.txt
+449
-421
@@ -1,10 +1,10 @@
1
To: git@vger.kernel.org
2
Bcc: lwn@lwn.net
3
-Subject: What's cooking in git.git (Oct 2018, #01; Wed, 10)
3
+Subject: What's cooking in git.git (Oct 2018, #02; Sat, 13)
4
X-master-at: 5a0cc8aca797dbd7d2be3b67458ff880ed45cddf
5
-X-next-at: 04861070400d3ca9d487bd0d736ca818b9ffe371
5
+X-next-at: 152ad8e3369ac77026886a2910e3a407c281df35
6
7
-What's cooking in git.git (Oct 2018, #01; Wed, 10)
7
+What's cooking in git.git (Oct 2018, #02; Sat, 13)
8
--------------------------------------------------
9
10
Here are the topics that have been cooking. Commits prefixed with
@@ -12,10 +12,8 @@ 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
-We haven't seen much complaints and breakages reported against the
16
-two big "rewrite in C" topics around "rebase"; perhaps it is a good
17
-time to merge them to 'next' soonish to cook them for a few weeks
18
-before moving them to 'master'?
15
+Quite a lot of topics have been merged to 'next'. Let's see how
16
+well they fare.
17
18
You can find the changes described here in the integration branches
19
of the repositories listed at
@@ -23,141 +21,167 @@ of the repositories listed at
21
http://git-blame.blogspot.com/p/git-public-repositories.html
22
23
--------------------------------------------------
26
-[Graduated to "master"]
27
-
28
-* ab/fsck-skiplist (2018-09-12) 10 commits
29
- (merged to 'next' on 2018-09-24 at 26adeb8b8f)
30
- + fsck: support comments & empty lines in skipList
31
- + fsck: use oidset instead of oid_array for skipList
32
- + fsck: use strbuf_getline() to read skiplist file
33
- + fsck: add a performance test for skipList
34
- + fsck: add a performance test
35
- + fsck: document that skipList input must be unabbreviated
36
- + fsck: document and test commented & empty line skipList input
37
- + fsck: document and test sorted skipList input
38
- + fsck tests: add a test for no skipList input
39
- + fsck tests: setup of bogus commit object
40
-
41
- (Originally merged to 'next' on 2018-09-17 at dc9094ba9b)
42
-
43
- Update fsck.skipList implementation and documentation.
44
-
45
-
46
-* bc/hash-independent-tests (2018-09-17) 11 commits
47
- (merged to 'next' on 2018-09-24 at 7c4a61fe46)
48
- + t5318: use test_oid for HASH_LEN
49
- + t1407: make hash size independent
50
- + t1406: make hash-size independent
51
- + t1405: make hash size independent
52
- + t1400: switch hard-coded object ID to variable
53
- + t1006: make hash size independent
54
- + t0064: make hash size independent
55
- + t0002: abstract away SHA-1 specific constants
56
- + t0000: update tests for SHA-256
57
- + t0000: use hash translation table
58
- + t: add test functions to translate hash-related values
59
-
60
- (Originally merged to 'next' on 2018-09-17 at 9e94794d05)
61
-
62
- Various tests have been updated to make it easier to swap the
63
- hash function used for object identification.
64
-
65
-
66
-* ds/multi-pack-verify (2018-09-17) 11 commits
67
- (merged to 'next' on 2018-09-24 at f294a34aaf)
68
- + fsck: verify multi-pack-index
69
- + multi-pack-index: report progress during 'verify'
70
- + multi-pack-index: verify object offsets
71
- + multi-pack-index: fix 32-bit vs 64-bit size check
72
- + multi-pack-index: verify oid lookup order
73
- + multi-pack-index: verify oid fanout order
74
- + multi-pack-index: verify missing pack
75
- + multi-pack-index: verify packname order
76
- + multi-pack-index: verify corrupt chunk lookup table
77
- + multi-pack-index: verify bad header
78
- + multi-pack-index: add 'verify' verb
79
-
80
- (Originally merged to 'next' on 2018-09-17 at f27244f302)
81
-
82
- "git multi-pack-index" learned to detect corruption in the .midx
83
- file it uses, and this feature has been integrated into "git fsck".
84
-
85
-
86
-* nd/config-split (2018-09-12) 11 commits
87
- (merged to 'next' on 2018-09-24 at 150cb40d2c)
88
- + config.txt: move submodule part out to a separate file
89
- + config.txt: move sequence.editor out of "core" part
90
- + config.txt: move sendemail part out to a separate file
91
- + config.txt: move receive part out to a separate file
92
- + config.txt: move push part out to a separate file
93
- + config.txt: move pull part out to a separate file
94
- + config.txt: move gui part out to a separate file
95
- + config.txt: move gitcvs part out to a separate file
96
- + config.txt: move format part out to a separate file
97
- + config.txt: move fetch part out to a separate file
98
- + config.txt: follow camelCase naming
99
-
100
- (Originally merged to 'next' on 2018-09-17 at 33e6cb8f48)
101
-
102
- Split Documentation/config.txt for easier maintenance.
103
-
104
-
105
-* nd/test-tool (2018-09-11) 6 commits
106
- (merged to 'next' on 2018-09-24 at 23ad767573)
107
- + Makefile: add a hint about TEST_BUILTINS_OBJS
108
- + t/helper: merge test-dump-fsmonitor into test-tool
109
- + t/helper: merge test-parse-options into test-tool
110
- + t/helper: merge test-pkt-line into test-tool
111
- + t/helper: merge test-dump-untracked-cache into test-tool
112
- + t/helper: keep test-tool command list sorted
113
-
114
- (Originally merged to 'next' on 2018-09-17 at decbf86eeb)
115
-
116
- Test helper binaries clean-up.
24
+[New Topics]
25
+
26
+* ab/gc-doc-update (2018-10-11) 1 commit
27
+ - gc doc: mention the commit-graph in the intro
28
+
29
+ The documentation of "git gc" has been updated to mention that it
30
+ is no longer limited to "pruning away crufts" but also updates
31
+ ancillary files like commit-graph as a part of repository
32
+ optimization.
33
+
34
+ Waiting for reactions.
35
+ cf. <20181010193818.20399-1-avarab@gmail.com>
36
+ The author seems to feel that this might be controversial.
37
+
38
+
39
+* du/branch-show-current (2018-10-12) 2 commits
40
+ - SQUASH???
41
+ - branch: introduce --show-current display option
42
+
43
+ "git branch" learned a new subcommand "--show-current".
44
+
45
+
46
+* du/rev-parse-is-plumbing (2018-10-11) 1 commit
47
+ - doc: move git-rev-parse from porcelain to plumbing
48
+
49
+ Doc update.
50
+
51
+ Will merge to 'next'.
52
+
53
+
54
+* mm/doc-no-dashed-git (2018-10-11) 1 commit
55
+ - doc: fix a typo and clarify a sentence
56
+
57
+ Doc update.
58
+
59
+ Will merge to 'next'.
60
+
61
+
62
+* ot/ref-filter-plug-leaks (2018-10-11) 3 commits
63
+ . ref-filter: free item->value and item->value->s
64
+ . ls-remote: release memory instead of UNLEAK
65
+ . ref-filter: free memory from used_atom
66
+
67
+ Plugging a handful of memory leaks in the ref-filter codepath.
68
+
69
+ Seems to break t6300 standalone and when merged to 'pu'.
70
+
71
+
72
+* rv/send-email-cc-misc-by (2018-10-11) 3 commits
73
+ - send-email: also pick up cc addresses from -by trailers
74
+ - send-email: only consider lines containing @ or <> for automatic Cc'ing
75
+ - Documentation/git-send-email.txt: style fixes
76
+
77
+ "git send-email" learned to grab address-looking string on any
78
+ trailer whose name ends with "-by"; --suppress-cc=misc-by on the
79
+ command line, or setting sendemail.suppresscc configuration
80
+ variable to "misc-by", can be used to disable this behaviour.
81
+
82
+ This is a backward-incompatible change that may surprise existing
83
+ users.
84
+
85
+
86
+* du/cherry-is-plumbing (2018-10-12) 1 commit
87
+ - doc: move git-cherry to plumbing
88
+
89
+ Doc update to mark "git cherry" as a plumbing command.
90
+
91
+
92
+* du/get-tar-commit-id-is-plumbing (2018-10-12) 1 commit
93
+ - doc: move git-get-tar-commit-id to plumbing
94
+
95
+ Doc update to mark "git get-tar-commit-id" as a plumbing command.
96
+
97
+ Will merge to 'next'.
98
+
99
+
100
+* lm/range-diff-submodule-fix (2018-10-12) 1 commit
101
+ - range-diff: allow to diff files regardless submodule
102
+
103
+ "git range-diff" did not work well when the compared ranges had
104
+ changes in submodules and the "--submodule=log" was used.
105
+
106
+ Will merge to 'next'.
107
+
108
+
109
+* sb/diff-emit-line-ws-markup-cleanup (2018-10-12) 1 commit
110
+ - diff.c: pass sign_index to emit_line_ws_markup
111
+
112
+ Code clean-up.
113
+
114
+ Will merge to 'next'.
115
116
--------------------------------------------------
119
-[New Topics]
117
+[Stalled]
118
+
119
+* lt/date-human (2018-07-09) 1 commit
120
+ - Add 'human' date format
121
+
122
+ A new date format "--date=human" that morphs its output depending
123
+ on how far the time is from the current time has been introduced.
124
+ "--date=auto" can be used to use this new format when the output is
125
+ goint to the pager or to the terminal and otherwise the default
126
+ format.
127
+
128
+--------------------------------------------------
129
+[Cooking]
130
+
131
+* mk/use-size-t-in-zlib (2018-10-12) 1 commit
132
+ - zlib.c: use size_t for size
133
+
134
+ The wrapper to call into zlib followed our long tradition to use
135
+ "unsigned long" for sizes of regions in memory, which have been
136
+ updated to use "size_t".
137
+
138
139
* ds/reachable-final-cleanup (2018-09-25) 1 commit
122
- - commit-reach: cleanups in can_all_from_reach...
140
+ (merged to 'next' on 2018-10-12 at 32c6d5f55a)
141
+ + commit-reach: cleanups in can_all_from_reach...
142
143
Code already in 'master' is further cleaned-up by this patch.
144
126
- Will merge to 'next'.
145
+ Will merge to 'master'.
146
147
148
* dz/credential-doc-url-matching-rules (2018-09-27) 1 commit
130
- - doc: clarify gitcredentials path component matching
149
+ (merged to 'next' on 2018-10-12 at 4547952530)
150
+ + doc: clarify gitcredentials path component matching
151
152
Doc update.
153
134
- Will merge to 'next'.
154
+ Will merge to 'master'.
155
156
157
* en/status-multiple-renames-to-the-same-target-fix (2018-09-27) 1 commit
138
- - commit: fix erroneous BUG, 'multiple renames on the same target? how?'
158
+ (merged to 'next' on 2018-10-12 at 4976fc61a0)
159
+ + commit: fix erroneous BUG, 'multiple renames on the same target? how?'
160
161
The code in "git status" sometimes hit an assertion failure. This
162
was caused by a structure that was reused without cleaning the data
163
used for the first run, which has been corrected.
164
144
- Will merge to 'next'.
165
+ Will merge to 'master'.
166
167
168
* jc/how-to-document-api (2018-09-29) 1 commit
148
- - CodingGuidelines: document the API in *.h files
169
+ (merged to 'next' on 2018-10-12 at 7c9bd82285)
170
+ + CodingGuidelines: document the API in *.h files
171
172
Doc update.
173
152
- Will merge to 'next'.
174
+ Will merge to 'master'.
175
176
155
-* jc/rebase-in-c-5-test-typofix (2018-09-28) 1 commit
177
+* jc/rebase-in-c-5-test-typofix (2018-10-11) 1 commit
178
- rebase: fix typoes in error messages
179
(this branch uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
180
181
Typofix.
182
183
+ Will merge to 'next' together with pk/rebase-i-in-c-6-final.
184
+
185
186
* jc/war-on-string-list (2018-09-28) 1 commit
187
- fetch: replace string-list used as a look-up table with a hashmap
@@ -168,60 +192,66 @@ of the repositories listed at
192
193
194
* jk/check-everything-connected-is-long-gone (2018-09-25) 1 commit
171
- - receive-pack: update comment with check_everything_connected
195
+ (merged to 'next' on 2018-10-12 at 4ce30c9a30)
196
+ + receive-pack: update comment with check_everything_connected
197
198
Comment fix.
199
175
- Will merge to 'next'.
200
+ Will merge to 'master'.
201
202
203
* jk/oideq-hasheq-cleanup (2018-10-04) 1 commit
179
- - more oideq/hasheq conversions
204
+ (merged to 'next' on 2018-10-12 at 7c9b5681da)
205
+ + more oideq/hasheq conversions
206
207
Code clean-up.
208
183
- Will merge to 'next'.
209
+ Will merge to 'master'.
210
211
212
* js/mingw-wants-vista-or-above (2018-10-04) 3 commits
187
- - mingw: bump the minimum Windows version to Vista
188
- - mingw: set _WIN32_WINNT explicitly for Git for Windows
189
- - compat/poll: prepare for targeting Windows Vista
213
+ (merged to 'next' on 2018-10-12 at 3a174c3d43)
214
+ + mingw: bump the minimum Windows version to Vista
215
+ + mingw: set _WIN32_WINNT explicitly for Git for Windows
216
+ + compat/poll: prepare for targeting Windows Vista
217
218
The minimum version of Windows supported by Windows port fo Git is
219
now set to Vista.
220
194
- Will merge to 'next'.
221
+ Will merge to 'master'.
222
223
197
-* js/rebase-i-break (2018-10-09) 1 commit
224
+* js/rebase-i-break (2018-10-12) 2 commits
225
- rebase -i: introduce the 'break' command
226
+ - rebase -i: clarify what happens on a failed `exec`
227
(this branch uses ag/rebase-i-in-c; is tangled with ag/sequencer-reduce-rewriting-todo, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
228
229
"git rebase -i" learned a new insn, 'break', that the user can
230
insert in the to-do list. Upon hitting it, the command returns
231
control back to the user.
232
205
- Will hold, waiting for the "rebase-in-c" and "rebase-i-in-c" topics.
233
+ Will merge to 'next' after 'pk/rebase-in-c-6-final'.
234
235
236
* js/remote-archive-v2 (2018-09-28) 4 commits
209
- - archive: allow archive over HTTP(S) with proto v2
210
- - archive: implement protocol v2 archive command
211
- - archive: use packet_reader for communications
212
- - archive: follow test standards around assertions
237
+ (merged to 'next' on 2018-10-12 at 5f34377f60)
238
+ + archive: allow archive over HTTP(S) with proto v2
239
+ + archive: implement protocol v2 archive command
240
+ + archive: use packet_reader for communications
241
+ + archive: follow test standards around assertions
242
243
The original implementation of "git archive --remote" more or less
244
bypassed the transport layer and did not work over http(s). The
245
version 2 of the protocol is defined to allow going over http(s) as
246
well as Git native transport.
247
219
- Will merge to 'next'.
248
+ Will merge to 'master'.
249
250
251
* jt/non-blob-lazy-fetch (2018-10-04) 2 commits
223
- - fetch-pack: exclude blobs when lazy-fetching trees
224
- - fetch-pack: avoid object flags if no_dependents
252
+ (merged to 'next' on 2018-10-12 at 7466c6bd7d)
253
+ + fetch-pack: exclude blobs when lazy-fetching trees
254
+ + fetch-pack: avoid object flags if no_dependents
255
256
A partial clone that is configured to lazily fetch missing objects
257
will on-demand issue a "git fetch" request to the originating
@@ -230,34 +260,37 @@ of the repositories listed at
260
objects contained in it) by telling the originating repository that
261
no blobs are needed.
262
233
- Will merge to 'next'.
263
+ Will merge to 'master'.
264
265
266
* ma/commit-graph-docs (2018-09-27) 4 commits
237
- - Doc: refer to the "commit-graph file" with dash
238
- - git-commit-graph.txt: refer to "*commit*-graph file"
239
- - git-commit-graph.txt: typeset more in monospace
240
- - git-commit-graph.txt: fix bullet lists
267
+ (merged to 'next' on 2018-10-12 at eafaf79b5a)
268
+ + Doc: refer to the "commit-graph file" with dash
269
+ + git-commit-graph.txt: refer to "*commit*-graph file"
270
+ + git-commit-graph.txt: typeset more in monospace
271
+ + git-commit-graph.txt: fix bullet lists
272
273
Doc update.
274
244
- Will merge to 'next'.
275
+ Will merge to 'master'.
276
277
278
* ma/mailing-list-address-in-git-help (2018-09-29) 1 commit
248
- - git doc: direct bug reporters to mailing list archive
279
+ (merged to 'next' on 2018-10-12 at 4c3737d234)
280
+ + git doc: direct bug reporters to mailing list archive
281
282
Doc update.
283
252
- Will merge to 'next'.
284
+ Will merge to 'master'.
285
286
287
* ma/t1400-undebug-test (2018-09-28) 1 commit
256
- - t1400: drop debug `echo` to actually execute `test`
288
+ (merged to 'next' on 2018-10-12 at d736f83435)
289
+ + t1400: drop debug `echo` to actually execute `test`
290
291
Test fix.
292
260
- Will merge to 'next'.
293
+ Will merge to 'master'.
294
295
296
* ma/t7005-bash-workaround (2018-09-28) 1 commit
@@ -269,7 +302,8 @@ of the repositories listed at
302
303
304
* nd/help-commands-verbose-by-default (2018-10-03) 1 commit
272
- - help -a: improve and make --verbose default
305
+ (merged to 'next' on 2018-10-12 at 32de8f53e0)
306
+ + help -a: improve and make --verbose default
307
308
"git help -a" and "git help -av" give different pieces of
309
information, and generally the "verbose" version is more friendly
@@ -278,75 +312,95 @@ of the repositories listed at
312
original). Also "git help -av" now lists aliases and external
313
commands, which it did not used to.
314
281
- Will merge to 'next'.
315
+ Will merge to 'master'.
316
317
318
* nd/packobjectshook-doc-fix (2018-09-29) 1 commit
285
- - config.txt: correct the note about uploadpack.packObjectsHook
319
+ (merged to 'next' on 2018-10-12 at 85d75f5219)
320
+ + config.txt: correct the note about uploadpack.packObjectsHook
321
322
Doc update.
323
289
- Will merge to 'next'.
324
+ Will merge to 'master'.
325
326
327
* pw/diff-color-moved-ws-fix (2018-10-04) 5 commits
293
- - diff --color-moved: fix a memory leak
294
- - diff --color-moved-ws: fix another memory leak
295
- - diff --color-moved-ws: fix a memory leak
296
- - diff --color-moved-ws: fix out of bounds string access
297
- - diff --color-moved-ws: fix double free crash
328
+ (merged to 'next' on 2018-10-12 at 73badc83fe)
329
+ + diff --color-moved: fix a memory leak
330
+ + diff --color-moved-ws: fix another memory leak
331
+ + diff --color-moved-ws: fix a memory leak
332
+ + diff --color-moved-ws: fix out of bounds string access
333
+ + diff --color-moved-ws: fix double free crash
334
335
Various fixes to "diff --color-moved-ws".
336
301
- What's the status of this topic?
337
+ Will merge to 'master'.
338
339
340
* rs/grep-no-recursive (2018-10-03) 1 commit
305
- - grep: add -r/--[no-]recursive
341
+ (merged to 'next' on 2018-10-12 at 1499dc98ba)
342
+ + grep: add -r/--[no-]recursive
343
344
Unlike "grep", "git grep" by default recurses to the whole tree.
345
The command learned "git grep --recursive" option, so that "git
346
grep --no-recursive" can serve as a synonym to setting the
347
max-depth to 0.
348
312
- Will merge to 'next'.
349
+ Will merge to 'master'.
350
351
352
* rs/oidset-on-khash (2018-10-04) 5 commits
316
- - oidset: uninline oidset_init()
317
- - oidset: use khash
318
- - khash: factor out kh_release_*
319
- - fetch-pack: load tip_oids eagerly iff needed
320
- - fetch-pack: factor out is_unmatched_ref()
353
+ (merged to 'next' on 2018-10-12 at 8bb0152b3f)
354
+ + oidset: uninline oidset_init()
355
+ + oidset: use khash
356
+ + khash: factor out kh_release_*
357
+ + fetch-pack: load tip_oids eagerly iff needed
358
+ + fetch-pack: factor out is_unmatched_ref()
359
360
The oidset API was built on top of the oidmap API which in turn is
361
on the hashmap API. Replace the implementation to build on top of
362
the khash API and gain performance.
363
326
- Will merge to 'next'.
364
+ Will merge to 'master'.
365
366
367
* rs/sequencer-oidset-insert-avoids-dups (2018-10-03) 1 commit
330
- - sequencer: use return value of oidset_insert()
368
+ (merged to 'next' on 2018-10-12 at b294394711)
369
+ + sequencer: use return value of oidset_insert()
370
371
Code clean-up.
372
334
- Will merge to 'next'.
373
+ Will merge to 'master'.
374
375
376
* rt/rebase-typofix (2018-09-28) 1 commit
338
- - git-rebase.sh: fix typos in error messages
377
+ (merged to 'next' on 2018-10-12 at 58691d20df)
378
+ + git-rebase.sh: fix typos in error messages
379
380
Typofix.
381
342
- Will merge to 'next'.
382
+ Will merge to 'master'.
383
384
345
-* rv/alias-help (2018-10-03) 3 commits
385
+* rv/alias-help (2018-10-11) 3 commits
386
- git-help.txt: document "git help cmd" vs "git cmd --help" for aliases
387
- git.c: handle_alias: prepend alias info when first argument is -h
388
- help: redirect to aliased commands for "git cmd --help"
389
390
+ "git cmd --help" when "cmd" is aliased used to only say "cmd is
391
+ aliased to ...". Now it shows that to the standard error stream
392
+ and runs "git $cmd --help" where $cmd is the first word of the
393
+ alias expansion. This could be misleading for those who alias a
394
+ command with options (e.g. with "[alias] cpn = cherry-pick -n",
395
+ "git cpn --help" would show the manual of "cherry-pick", and the
396
+ reader would not be told to pay close attention to the part that
397
+ describes the "--no-commit" option until closing the pager that
398
+ showed the contents of the manual, if the pager is configured to
399
+ restore the original screen, or would not be told at all, if the
400
+ pager simply makes the message on the standard error scroll away.
401
+
402
+ Will merge to 'next'.
403
+
404
405
* sb/strbuf-h-update (2018-09-29) 1 commit
406
- strbuf.h: format according to coding guidelines
@@ -357,9 +411,10 @@ of the repositories listed at
411
cf. <CAGZ79kbV6QjsFKcD2uG_P9j1AvzSNQSi-_jXGQ9w0YU9fjhEGg@mail.gmail.com>
412
413
360
-* sg/split-index-racefix (2018-09-28) 6 commits
414
+* sg/split-index-racefix (2018-10-12) 7 commits
415
+ - split-index: BUG() when cache entry refers to non-existing shared entry
416
- split-index: smudge and add racily clean cache entries to split index
362
- - split-index: don't compare stat data of entries already marked for split index
417
+ - split-index: don't compare cached data of entries already marked for split index
418
- split-index: count the number of deleted entries
419
- t1700-split-index: date back files to avoid racy situations
420
- split-index: add tests to demonstrate the racy split index problem
@@ -368,16 +423,16 @@ of the repositories listed at
423
The codepath to support the experimental split-index mode had
424
remaining "racily clean" issues fixed.
425
371
- Expecting the final one.
372
- cf. <20181008154126.GY23446@localhost>
426
+ Will merge to 'next'.
427
428
429
* sm/show-superproject-while-conflicted (2018-09-28) 1 commit
376
- - rev-parse: --show-superproject-working-tree should work during a merge
430
+ (merged to 'next' on 2018-10-12 at 0334353131)
431
+ + rev-parse: --show-superproject-working-tree should work during a merge
432
433
A corner-case bugfix.
434
380
- Will merge to 'next'.
435
+ Will merge to 'master'.
436
437
438
* ag/sequencer-reduce-rewriting-todo (2018-10-09) 16 commits
@@ -435,24 +490,28 @@ of the repositories listed at
490
- builtin/repack: replace hard-coded constant
491
- pack-bitmap-write: use GIT_MAX_RAWSZ for allocation
492
493
+ More codepaths are moving away from hardcoded hash sizes.
494
+
495
496
* ch/subtree-build (2018-10-10) 1 commit
440
- - subtree: add build targets 'man' and 'html'
497
+ (merged to 'next' on 2018-10-12 at 4ed9ff6300)
498
+ + subtree: add build targets 'man' and 'html'
499
500
Build update for "git subtree" (in contrib/) documentation pages.
501
444
- Will merge to 'next'.
502
+ Will merge to 'master'.
503
504
505
* ds/commit-graph-leakfix (2018-10-07) 3 commits
448
- - commit-graph: reduce initial oid allocation
449
- - builtin/commit-graph.c: UNLEAK variables
450
- - commit-graph: clean up leaked memory during write
506
+ (merged to 'next' on 2018-10-12 at 8cc7f2f1e9)
507
+ + commit-graph: reduce initial oid allocation
508
+ + builtin/commit-graph.c: UNLEAK variables
509
+ + commit-graph: clean up leaked memory during write
510
(this branch uses ab/commit-graph-progress.)
511
512
Code clean-up.
513
455
- Will merge to 'next'.
514
+ Will merge to 'master'.
515
516
517
* ds/test-multi-pack-index (2018-10-09) 3 commits
@@ -475,20 +534,22 @@ of the repositories listed at
534
535
536
* jt/avoid-ls-refs (2018-10-07) 4 commits
478
- - fetch: do not list refs if fetching only hashes
479
- - transport: list refs before fetch if necessary
480
- - transport: do not list refs if possible
481
- - transport: allow skipping of ref listing
537
+ (merged to 'next' on 2018-10-12 at 5775aabbc1)
538
+ + fetch: do not list refs if fetching only hashes
539
+ + transport: list refs before fetch if necessary
540
+ + transport: do not list refs if possible
541
+ + transport: allow skipping of ref listing
542
543
Over some transports, fetching objects with an exact commit object
544
name can be done without first seeing the ref advertisements. The
545
code has been optimized to exploit this.
546
487
- Will merge to 'next'.
547
+ Will merge to 'master'.
548
549
550
* jt/cache-tree-allow-missing-object-in-partial-clone (2018-10-10) 1 commit
491
- - cache-tree: skip some blob checks in partial clone
551
+ (merged to 'next' on 2018-10-12 at 152ad8e336)
552
+ + cache-tree: skip some blob checks in partial clone
553
554
In a partial clone that will lazily be hydrated from the
555
originating repository, we generally want to avoid "does this
@@ -498,78 +559,74 @@ of the repositories listed at
559
object exists, even for paths that are outside of the partial
560
checkout area. The code has been updated to avoid such a check.
561
501
- Will merge to 'next'.
562
+ Will merge to 'master'.
563
564
565
* mw/doc-typofixes (2018-10-07) 3 commits
505
- - docs: typo: s/isimilar/similar/
506
- - docs: graph: remove unnecessary `graph_update()' call
507
- - docs: typo: s/go/to/
566
+ (merged to 'next' on 2018-10-12 at 97297b8ce9)
567
+ + docs: typo: s/isimilar/similar/
568
+ + docs: graph: remove unnecessary `graph_update()' call
569
+ + docs: typo: s/go/to/
570
571
Typofixes.
572
511
- Will merge to 'next'.
573
+ Will merge to 'master'.
574
575
576
* nd/per-worktree-ref-iteration (2018-10-07) 9 commits
515
- - SQUASH???
516
- - reflog expire: cover reflog from all worktrees
517
- - fsck: check HEAD and reflog from other worktrees
518
- - fsck: Move fsck_head_link() to get_default_heads() to avoid some globals
519
- - revision.c: better error reporting on ref from different worktrees
520
- - revision.c: correct a parameter name
521
- - refs: new ref types to make per-worktree refs visible to all worktrees
522
- - Add a place for (not) sharing stuff between worktrees
523
- - refs.c: indent with tabs, not spaces
577
+ . SQUASH???
578
+ . reflog expire: cover reflog from all worktrees
579
+ . fsck: check HEAD and reflog from other worktrees
580
+ . fsck: Move fsck_head_link() to get_default_heads() to avoid some globals
581
+ . revision.c: better error reporting on ref from different worktrees
582
+ . revision.c: correct a parameter name
583
+ . refs: new ref types to make per-worktree refs visible to all worktrees
584
+ . Add a place for (not) sharing stuff between worktrees
585
+ . refs.c: indent with tabs, not spaces
586
525
- What's the status of this topic?
587
+ Ejected for now, as it seems to break t2025 when in 'pu'.
588
589
528
-* np/log-graph-octopus-fix (2018-10-10) 1 commit
590
+* np/log-graph-octopus-fix (2018-10-12) 1 commit
591
- log: fix coloring of certain octopus merge shapes
592
593
"git log --graph" showing an octopus merge sometimes miscounted the
594
number of display columns it is consuming to show the merge and its
595
parent commits, which has been corrected.
596
535
- Expecting a clarification.
536
- cf. <xmqqzhvmmv8v.fsf@gitster-ct.c.googlers.com>
597
+ Will merge to 'next'.
598
599
539
-* rs/subtree-fixes (2018-10-07) 4 commits
540
- - subtree: improve decision on merges kept in split
541
- - subtree: use commits before rejoins for splits
542
- - subtree: make --ignore-joins pay attention to adds
543
- - subtree: refactor split of a commit into standalone method
600
+* rs/subtree-fixes (2018-10-12) 5 commits
601
+ - subtree: performance improvement for finding unexpected parent commits
602
+ (merged to 'next' on 2018-10-12 at 2b47258e04)
603
+ + subtree: improve decision on merges kept in split
604
+ + subtree: use commits before rejoins for splits
605
+ + subtree: make --ignore-joins pay attention to adds
606
+ + subtree: refactor split of a commit into standalone method
607
608
Various subtree fixes.
609
547
- Will merge to 'next'.
610
+ Will merge to 'master'.
611
Unless somebody objects, that is.
612
613
551
-* sb/grep-submodule-cleanup (2018-10-10) 1 commit
552
- - builtin/grep.c: remove superfluous submodule code
553
-
554
- Code clean-up.
555
-
556
- cf. <20181010001037.74709-1-jonathantanmy@google.com>
557
-
558
-
614
* sf/complete-stash-list (2018-10-07) 1 commit
560
- - git-completion.bash: add completion for stash list
615
+ (merged to 'next' on 2018-10-12 at ff0e9a0805)
616
+ + git-completion.bash: add completion for stash list
617
618
The completion script (in contrib/) lerned to complete a handful of
619
options "git stash list" command takes.
620
565
- Will merge to 'next'.
621
+ Will merge to 'master'.
622
623
624
* tb/filter-alternate-refs (2018-10-09) 4 commits
569
- - transport.c: introduce core.alternateRefsPrefixes
570
- - transport.c: introduce core.alternateRefsCommand
571
- - transport.c: extract 'fill_alternate_refs_command'
572
- - transport: drop refnames from for_each_alternate_ref
625
+ (merged to 'next' on 2018-10-12 at 21c14722f1)
626
+ + transport.c: introduce core.alternateRefsPrefixes
627
+ + transport.c: introduce core.alternateRefsCommand
628
+ + transport.c: extract 'fill_alternate_refs_command'
629
+ + transport: drop refnames from for_each_alternate_ref
630
631
When pushing into a repository that borrows its objects from an
632
alternate object store, "git receive-pack" that responds to the
@@ -581,121 +638,8 @@ of the repositories listed at
638
advertisement. The alternate refs that are advertised are now
639
configurable with a pair of configuration variables.
640
584
- Will merge to 'next'.
585
-
586
---------------------------------------------------
587
-[Stalled]
588
-
589
-* bw/submodule-name-to-dir (2018-08-10) 2 commits
590
- - submodule: munge paths to submodule git directories
591
- - submodule: create helper to build paths to submodule gitdirs
592
-
593
- In modern repository layout, the real body of a cloned submodule
594
- repository is held in .git/modules/ of the superproject, indexed by
595
- the submodule name. URLencode the submodule name before computing
596
- the name of the directory to make sure they form a flat namespace.
597
-
598
- Kicked back to 'pu', expecting further work on the topic.
599
- cf. <CAGZ79kYnbjaPoWdda0SM_-_X77mVyYC7JO61OV8nm2yj3Q1OvQ@mail.gmail.com>
600
-
601
-
602
-* ng/status-i-short-for-ignored (2018-08-09) 1 commit
603
- - status: -i shorthand for --ignored command line option
604
-
605
- "git status --ignored" gained a shorthand "git status -i".
606
-
607
- Will discard, after hearing no strong support.
608
- What's the list opinion on this one? It is Meh to me, but
609
- obviously the author cared enough to write a patch, so...
610
-
611
-
612
-* sb/submodule-move-head-with-corruption (2018-08-28) 2 commits
613
- - submodule.c: warn about missing submodule git directories
614
- - t2013: add test for missing but active submodule
615
-
616
- Will discard and wait for a cleaned-up rewrite.
617
- cf. <20180907195349.GA103699@aiede.svl.corp.google.com>
618
-
619
-
620
-* sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits
621
- . commit: fix exit code when doing a dry run
622
- . wt-status: teach wt_status_collect about merges in progress
623
- . wt-status: rename commitable to committable
624
- . t7501: add coverage for flags which imply dry runs
625
-
626
- "git commit --dry-run" gave a correct exit status even during a
627
- conflict resolution toward a merge, but it did not with the
628
- "--short" option, which has been corrected.
629
-
630
- Seems to break 7512, 3404 and 7060 in 'pu'.
631
-
632
-
633
-* ma/wrapped-info (2018-05-28) 2 commits
634
- - usage: prefix all lines in `vreportf()`, not just the first
635
- - usage: extract `prefix_suffix_lines()` from `advise()`
636
-
637
- An attempt to help making multi-line messages fed to warning(),
638
- error(), and friends more easily translatable.
639
-
640
- Will discard and wait for a cleaned-up rewrite.
641
- cf. <20180529213957.GF7964@sigill.intra.peff.net>
642
-
643
-
644
-* hn/bisect-first-parent (2018-04-21) 1 commit
645
- - bisect: create 'bisect_flags' parameter in find_bisection()
646
- (this branch is used by tb/bisect-first-parent.)
647
-
648
- Preliminary code update to allow passing more flags down the
649
- bisection codepath in the future.
650
-
651
- We do not add random code that does not have real users to our
652
- codebase, so let's have it wait until such a real code materializes
653
- before too long.
654
-
655
-
656
-* pb/bisect-helper-2 (2018-07-23) 8 commits
657
- - t6030: make various test to pass GETTEXT_POISON tests
658
- - bisect--helper: `bisect_start` shell function partially in C
659
- - bisect--helper: `get_terms` & `bisect_terms` shell function in C
660
- - bisect--helper: `bisect_next_check` shell function in C
661
- - bisect--helper: `check_and_set_terms` shell function in C
662
- - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
663
- - bisect--helper: `bisect_write` shell function in C
664
- - bisect--helper: `bisect_reset` shell function in C
665
-
666
- Expecting a reroll.
667
- cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
668
-
669
- I just rebased the topic to a newer base as it did not build
670
- standalone with the base I originally queued the topic on, but
671
- otherwise there is no update to address any of the review comments
672
- in the thread above---we are still waiting for a reroll.
673
-
674
-
675
-* jk/drop-ancient-curl (2017-08-09) 5 commits
676
- - http: #error on too-old curl
677
- - curl: remove ifdef'd code never used with curl >=7.19.4
678
- - http: drop support for curl < 7.19.4
679
- - http: drop support for curl < 7.16.0
680
- - http: drop support for curl < 7.11.1
681
-
682
- Some code in http.c that has bitrot is being removed.
683
-
684
- Expecting a reroll.
685
-
686
-
687
-* mk/use-size-t-in-zlib (2017-08-10) 1 commit
688
- . zlib.c: use size_t for size
689
-
690
- The wrapper to call into zlib followed our long tradition to use
691
- "unsigned long" for sizes of regions in memory, which have been
692
- updated to use "size_t".
693
-
694
- Needs resurrecting by making sure the fix is good and still applies
695
- (or adjusted to today's codebase).
641
+ Will merge to 'master'.
642
697
---------------------------------------------------
698
-[Cooking]
643
644
* fe/doc-updates (2018-09-21) 3 commits
645
(merged to 'next' on 2018-10-10 at 2eea3a88bc)
@@ -735,14 +679,15 @@ of the repositories listed at
679
680
681
* jt/fetch-tips-in-partial-clone (2018-09-21) 2 commits
738
- - fetch: in partial clone, check presence of targets
739
- - connected: document connectivity in partial clones
682
+ (merged to 'next' on 2018-10-12 at 521b3fb44d)
683
+ + fetch: in partial clone, check presence of targets
684
+ + connected: document connectivity in partial clones
685
686
"git fetch $repo $object" in a partial clone did not correctly
687
fetch the asked-for object that is referenced by an object in
688
promisor packfile, which has been fixed.
689
745
- Will merge to 'next'.
690
+ Will merge to 'master'.
691
692
693
* tg/t5551-with-curl-7.61.1 (2018-09-24) 2 commits
@@ -768,12 +713,13 @@ of the repositories listed at
713
714
715
* nd/status-refresh-progress (2018-09-17) 1 commit
771
- - status: show progress bar if refreshing the index takes too long
716
+ (merged to 'next' on 2018-10-12 at 9240c05add)
717
+ + status: show progress bar if refreshing the index takes too long
718
719
"git status" learns to show progress bar when refreshing the index
720
takes a long time.
721
776
- Will merge to 'next'.
722
+ Will merge to 'master'.
723
724
725
* nd/the-index (2018-09-21) 23 commits
@@ -801,6 +747,7 @@ of the repositories listed at
747
+ diff.c: reduce implicit dependency on the_index
748
+ read-cache.c: remove 'const' from index_has_changes()
749
+ archive.c: remove implicit dependency the_repository
750
+ (this branch is used by sb/more-repo-in-api.)
751
752
Various codepaths in the core-ish part learn to work on an
753
arbitrary in-core index structure, not necessarily the default
@@ -901,20 +848,20 @@ of the repositories listed at
848
Will merge to 'master'.
849
850
904
-* bp/read-cache-parallel (2018-09-28) 8 commits
905
- - read-cache: fix division by zero core-dump
906
- - read-cache: load cache entries on worker threads
907
- - ieot: add Index Entry Offset Table (IEOT) extension
908
- - read-cache: load cache extensions on a worker thread
909
- - config: add new index.threads config setting
910
- - eoie: add End of Index Entry (EOIE) extension
911
- - read-cache: clean up casting and byte decoding
912
- - read-cache.c: optimize reading index format v4
851
+* bp/read-cache-parallel (2018-10-11) 7 commits
852
+ (merged to 'next' on 2018-10-12 at ed6edde799)
853
+ + read-cache: load cache entries on worker threads
854
+ + ieot: add Index Entry Offset Table (IEOT) extension
855
+ + read-cache: load cache extensions on a worker thread
856
+ + config: add new index.threads config setting
857
+ + eoie: add End of Index Entry (EOIE) extension
858
+ + read-cache: clean up casting and byte decoding
859
+ + read-cache.c: optimize reading index format v4
860
861
A new extension to the index file has been introduced, which allows
862
the file to be read in parallel.
863
917
- Will merge to 'next'.
864
+ Will merge to 'master'.
865
866
867
* ds/coverage-diff (2018-10-10) 1 commit
@@ -924,39 +871,39 @@ of the repositories listed at
871
check the test coverage of code introduced recently with a new
872
'coverage-diff' tool (in contrib/).
873
874
+ Will merge to 'next'.
875
+
876
928
-* sb/submodule-recursive-fetch-gets-the-tip (2018-09-12) 9 commits
929
- - builtin/fetch: check for submodule updates for non branch fetches
930
- - fetch: retry fetching submodules if sha1 were not fetched
931
- - submodule: fetch in submodules git directory instead of in worktree
932
- - submodule.c: do not copy around submodule list
933
- - submodule: move global changed_submodule_names into fetch submodule struct
934
- - submodule.c: sort changed_submodule_names before searching it
935
- - submodule.c: fix indentation
936
- - sha1-array: provide oid_array_filter
937
- - string-list: add string_list_{pop, last} functions
877
+* sb/submodule-recursive-fetch-gets-the-tip (2018-10-11) 9 commits
878
+ . builtin/fetch: check for submodule updates for non branch fetches
879
+ . fetch: retry fetching submodules if needed objects were not fetched
880
+ . submodule: fetch in submodules git directory instead of in worktree
881
+ . repository: repo_submodule_init to take a submodule struct
882
+ . submodule.c: do not copy around submodule list
883
+ . submodule.c: move global changed_submodule_names into fetch submodule struct
884
+ . submodule.c: sort changed_submodule_names before searching it
885
+ . submodule.c: fix indentation
886
+ . sha1-array: provide oid_array_filter
887
888
"git fetch --recurse-submodules" may not fetch the necessary commit
889
that is bound to the superproject, which is getting corrected.
890
942
- Expecting a reroll.
943
- cf. <CAGZ79kbavjVbTqXsmtjW6=jhkq47_p3mc6=92xOp4_mfhqDtvw@mail.gmail.com>
944
- cf. <b16af8c0-0435-0de4-ed6c-53888d6190af@ramsayjones.plus.com>
945
- cf. <CAGZ79kZKKf9N8yx9EuCRZhrZS_mA2218PouEG7aHDhK2bJGEdA@mail.gmail.com>
891
+ Ejected for now, as it has fallouts in places like t/helper/.
892
893
894
* bp/rename-test-env-var (2018-09-28) 6 commits
949
- - t0000: do not get self-test disrupted by environment warnings
950
- - preload-index: update GIT_FORCE_PRELOAD_TEST support
951
- - read-cache: update TEST_GIT_INDEX_VERSION support
952
- - fsmonitor: update GIT_TEST_FSMONITOR support
953
- - preload-index: use git_env_bool() not getenv() for customization
954
- - t/README: correct spelling of "uncommon"
895
+ (merged to 'next' on 2018-10-12 at 201e451d20)
896
+ + t0000: do not get self-test disrupted by environment warnings
897
+ + preload-index: update GIT_FORCE_PRELOAD_TEST support
898
+ + read-cache: update TEST_GIT_INDEX_VERSION support
899
+ + fsmonitor: update GIT_TEST_FSMONITOR support
900
+ + preload-index: use git_env_bool() not getenv() for customization
901
+ + t/README: correct spelling of "uncommon"
902
903
Some environment variables that control the runtime options of Git
904
used during tests are getting renamed for consistency.
905
959
- Will merge to 'next'.
906
+ Will merge to 'master'.
907
908
909
* ab/commit-graph-progress (2018-09-20) 3 commits
@@ -983,7 +930,6 @@ of the repositories listed at
930
+ t7501: add test of "commit --dry-run --short"
931
+ wt-status: rename commitable to committable
932
+ wt-status.c: move has_unmerged earlier in the file
986
- (this branch is tangled with jc/wt-status-state-cleanup.)
933
934
Code clean-up in the internal machinery used by "git status" and
935
"git commit --dry-run".
@@ -991,19 +937,7 @@ of the repositories listed at
937
Will merge to 'master'.
938
939
994
-* ds/format-commit-graph-docs (2018-08-21) 2 commits
995
- - commit-graph.txt: improve formatting for asciidoc
996
- - Docs: Add commit-graph tech docs to Makefile
997
-
998
- Design docs for the commit-graph machinery is now made into HTML as
999
- well as text.
1000
-
1001
- Will discard.
1002
- I am inclined to drop these, as I do not see much clarity in HTML
1003
- output over the text source. Opinions?
1004
-
1005
-
1006
-* js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-10-09) 2 commits
940
+* js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-10-11) 2 commits
941
- builtin rebase: prepare for builtin rebase -i
942
- Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c
943
(this branch is used by pk/rebase-in-c-6-final; uses ag/rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix and js/rebase-i-break.)
@@ -1012,6 +946,8 @@ of the repositories listed at
946
used by "rebase -i" that was rewritten in C, tying the loose end
947
between two GSoC topics that stomped on each other's toes.
948
949
+ Will merge to 'next' together with pk/rebase-i-in-c-6-final.
950
+
951
952
* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
953
- add -p: coalesce hunks before testing applicability
@@ -1039,21 +975,25 @@ of the repositories listed at
975
HEAD:.gitmodules when the .gitmodules file is missing from the
976
working tree.
977
978
+ Expecting a reroll.
979
+ cf. <20181010205645.e1529eff9099805029b1d6ef@ao2.it>
980
+
981
982
* md/filter-trees (2018-10-07) 8 commits
1044
- - list-objects-filter: implement filter tree:0
1045
- - list-objects-filter-options: do not over-strbuf_init
1046
- - list-objects-filter: use BUG rather than die
1047
- - revision: mark non-user-given objects instead
1048
- - rev-list: handle missing tree objects properly
1049
- - list-objects: always parse trees gently
1050
- - list-objects: refactor to process_tree_contents
1051
- - list-objects: store common func args in struct
983
+ (merged to 'next' on 2018-10-12 at c66e49d4ca)
984
+ + list-objects-filter: implement filter tree:0
985
+ + list-objects-filter-options: do not over-strbuf_init
986
+ + list-objects-filter: use BUG rather than die
987
+ + revision: mark non-user-given objects instead
988
+ + rev-list: handle missing tree objects properly
989
+ + list-objects: always parse trees gently
990
+ + list-objects: refactor to process_tree_contents
991
+ + list-objects: store common func args in struct
992
993
The "rev-list --filter" feature learned to exclude all trees via
994
"tree:0" filter.
995
1056
- Will merge to 'next'.
996
+ Will merge to 'master'.
997
998
999
* pk/rebase-in-c-2-basic (2018-09-06) 11 commits
@@ -1070,6 +1010,10 @@ of the repositories listed at
1010
- builtin rebase: support --onto
1011
(this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c.)
1012
1013
+ Rewrite "git rebase" in C.
1014
+
1015
+ Will merge to 'next' together with pk/rebase-i-in-c-6-final.
1016
+
1017
1018
* pk/rebase-in-c-3-acts (2018-09-06) 7 commits
1019
- builtin rebase: stop if `git am` is in progress
@@ -1081,8 +1025,12 @@ of the repositories listed at
1025
- builtin rebase: support --continue
1026
(this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-4-opts, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c and pk/rebase-in-c-2-basic.)
1027
1028
+ Rewrite "git rebase" in C.
1029
+
1030
+ Will merge to 'next' together with pk/rebase-i-in-c-6-final.
1031
+
1032
1085
-* pk/rebase-in-c-4-opts (2018-09-06) 18 commits
1033
+* pk/rebase-in-c-4-opts (2018-10-11) 18 commits
1034
- builtin rebase: support --root
1035
- builtin rebase: add support for custom merge strategies
1036
- builtin rebase: support `fork-point` option
@@ -1103,8 +1051,12 @@ of the repositories listed at
1051
- builtin rebase: allow selecting the rebase "backend"
1052
(this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-5-test and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic and pk/rebase-in-c-3-acts.)
1053
1054
+ Rewrite "git rebase" in C.
1055
+
1056
+ Will merge to 'next' together with pk/rebase-i-in-c-6-final.
1057
+
1058
1107
-* pk/rebase-in-c-5-test (2018-09-06) 6 commits
1059
+* pk/rebase-in-c-5-test (2018-10-11) 6 commits
1060
- builtin rebase: error out on incompatible option/mode combinations
1061
- builtin rebase: use no-op editor when interactive is "implied"
1062
- builtin rebase: show progress when connected to a terminal
@@ -1113,22 +1065,18 @@ of the repositories listed at
1065
- builtin rebase: optionally auto-detect the upstream
1066
(this branch is used by jc/rebase-in-c-5-test-typofix, js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final; uses pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts and pk/rebase-in-c-4-opts.)
1067
1068
+ Rewrite "git rebase" in C.
1069
1117
-* pk/rebase-in-c-6-final (2018-10-09) 1 commit
1070
+ Will merge to 'next' together with pk/rebase-i-in-c-6-final.
1071
+
1072
+
1073
+* pk/rebase-in-c-6-final (2018-10-11) 1 commit
1074
- rebase: default to using the builtin rebase
1075
(this branch uses ag/rebase-i-in-c, js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c, pk/rebase-in-c-2-basic, pk/rebase-in-c-3-acts, pk/rebase-in-c-4-opts and pk/rebase-in-c-5-test; is tangled with ag/sequencer-reduce-rewriting-todo, jc/rebase-in-c-5-test-typofix and js/rebase-i-break.)
1076
1077
The final step of rewriting "rebase -i" in C.
1078
1123
- Undecided.
1124
- I've been using this (i.e. the whole "rebase -i" and "rebase"
1125
- rewritten in C) in my personal build, and I also know users on
1126
- Windows port have been using it with the last feature release. I
1127
- am tempted to merge the whole thing to 'next' soonish.
1128
-
1129
- Opinions? It's the last chance to remove any existing and avoid
1130
- any future "oops, that was wrong, and here is a fix-up"
1131
- embarrassment in these topics.
1079
+ Will merge to 'next'.
1080
1081
1082
* ps/stash-in-c (2018-08-31) 20 commits
@@ -1155,12 +1103,8 @@ of the repositories listed at
1103
1104
"git stash" rewritten in C.
1105
1158
- Undecided. This also has been part of my personal build. I do not
1159
- offhand recall if this also had the same exposure to the end users
1160
- as "rebase" and "rebase -i". I am tempted to merge this to 'next'
1161
- soonish.
1162
-
1163
- Opinions?
1106
+ Expecting a reroll.
1107
+ cf. <20181010141841.GA17445@hank.intra.tgummerer.com>
1108
1109
1110
* pw/add-p-select (2018-07-26) 4 commits
@@ -1243,15 +1187,7 @@ of the repositories listed at
1187
1188
Rewrite of the remaining "rebase -i" machinery in C.
1189
1246
-
1247
-* lt/date-human (2018-07-09) 1 commit
1248
- - Add 'human' date format
1249
-
1250
- A new date format "--date=human" that morphs its output depending
1251
- on how far the time is from the current time has been introduced.
1252
- "--date=auto" can be used to use this new format when the output is
1253
- goint to the pager or to the terminal and otherwise the default
1254
- format.
1190
+ Will merge to 'next' together with pk/rebase-i-in-c-6-final.
1191
1192
1193
* pk/rebase-in-c (2018-08-06) 3 commits
@@ -1262,18 +1198,110 @@ of the repositories listed at
1198
1199
Rewrite of the "rebase" machinery in C.
1200
1201
+ Will merge to 'next' together with pk/rebase-i-in-c-6-final.
1202
+
1203
--------------------------------------------------
1204
[Discarded]
1205
1268
-* tz/t5551-with-curl-7.61.1 (2018-09-17) 1 commit
1269
- . t5551-http-fetch-smart.sh: sort cookies before comparing
1206
+* sb/submodule-move-head-with-corruption (2018-08-28) 2 commits
1207
+ . submodule.c: warn about missing submodule git directories
1208
+ . t2013: add test for missing but active submodule
1209
1271
- Test fix.
1210
+ Discarded for a cleaned-up rewrite.
1211
+ cf. <CAGZ79kYJGMOtroLhPwOdhWewXf3X_b0QOgiUb65pyJ7xJ-whQw@mail.gmail.com>
1212
1273
- Discarded to be replaced with tg/t5551-with-curl-7.61.1 topic.
1213
1214
+* sb/grep-submodule-cleanup (2018-10-10) 1 commit
1215
+ . builtin/grep.c: remove superfluous submodule code
1216
+
1217
+ Code clean-up.
1218
1276
-* jc/wt-status-state-cleanup (2018-09-07) 1 commit
1277
- . WIP: roll wt_status_state into wt_status and populate in the collect phase
1219
+ Discarded, expecting a future reroll.
1220
+ cf. <CAGZ79kYJGMOtroLhPwOdhWewXf3X_b0QOgiUb65pyJ7xJ-whQw@mail.gmail.com>
1221
+ cf. <CAGZ79kbZ35OEh=2JiZuOHgG-P3a3PeSP5hgrXX-tQh9feOQsjQ@mail.gmail.com>
1222
1279
- A cleaned-up version appears as a part of ss/wt-status-committable.
1223
+
1224
+* jk/drop-ancient-curl (2017-08-09) 5 commits
1225
+ . http: #error on too-old curl
1226
+ . curl: remove ifdef'd code never used with curl >=7.19.4
1227
+ . http: drop support for curl < 7.19.4
1228
+ . http: drop support for curl < 7.16.0
1229
+ . http: drop support for curl < 7.11.1
1230
+
1231
+ Some code in http.c that has bitrot is being removed.
1232
+
1233
+
1234
+* ds/format-commit-graph-docs (2018-08-21) 2 commits
1235
+ . commit-graph.txt: improve formatting for asciidoc
1236
+ . Docs: Add commit-graph tech docs to Makefile
1237
+
1238
+ Design docs for the commit-graph machinery is now made into HTML as
1239
+ well as text.
1240
+
1241
+
1242
+* bw/submodule-name-to-dir (2018-08-10) 2 commits
1243
+ . submodule: munge paths to submodule git directories
1244
+ . submodule: create helper to build paths to submodule gitdirs
1245
+
1246
+ In modern repository layout, the real body of a cloned submodule
1247
+ repository is held in .git/modules/ of the superproject, indexed by
1248
+ the submodule name. URLencode the submodule name before computing
1249
+ the name of the directory to make sure they form a flat namespace.
1250
+
1251
+ Discarded, expecting further work on the topic.
1252
+ cf. <CAGZ79kYnbjaPoWdda0SM_-_X77mVyYC7JO61OV8nm2yj3Q1OvQ@mail.gmail.com>
1253
+
1254
+
1255
+* ng/status-i-short-for-ignored (2018-08-09) 1 commit
1256
+ . status: -i shorthand for --ignored command line option
1257
+
1258
+ "git status --ignored" gained a shorthand "git status -i".
1259
+
1260
+ Discarded after hearing no strong support.
1261
+
1262
+
1263
+* sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits
1264
+ . commit: fix exit code when doing a dry run
1265
+ . wt-status: teach wt_status_collect about merges in progress
1266
+ . wt-status: rename commitable to committable
1267
+ . t7501: add coverage for flags which imply dry runs
1268
+
1269
+ "git commit --dry-run" gave a correct exit status even during a
1270
+ conflict resolution toward a merge, but it did not with the
1271
+ "--short" option, which has been corrected.
1272
+
1273
+ Seems to break 7512, 3404 and 7060 in 'pu'.
1274
+
1275
+
1276
+* ma/wrapped-info (2018-05-28) 2 commits
1277
+ . usage: prefix all lines in `vreportf()`, not just the first
1278
+ . usage: extract `prefix_suffix_lines()` from `advise()`
1279
+
1280
+ An attempt to help making multi-line messages fed to warning(),
1281
+ error(), and friends more easily translatable.
1282
+
1283
+ Will discard and wait for a cleaned-up rewrite.
1284
+ cf. <20180529213957.GF7964@sigill.intra.peff.net>
1285
+
1286
+
1287
+* hn/bisect-first-parent (2018-04-21) 1 commit
1288
+ . bisect: create 'bisect_flags' parameter in find_bisection()
1289
+ (this branch is used by tb/bisect-first-parent.)
1290
+
1291
+ Preliminary code update to allow passing more flags down the
1292
+ bisection codepath in the future.
1293
+
1294
+
1295
+* pb/bisect-helper-2 (2018-07-23) 8 commits
1296
+ . t6030: make various test to pass GETTEXT_POISON tests
1297
+ . bisect--helper: `bisect_start` shell function partially in C
1298
+ . bisect--helper: `get_terms` & `bisect_terms` shell function in C
1299
+ . bisect--helper: `bisect_next_check` shell function in C
1300
+ . bisect--helper: `check_and_set_terms` shell function in C
1301
+ . wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()
1302
+ . bisect--helper: `bisect_write` shell function in C
1303
+ . bisect--helper: `bisect_reset` shell function in C
1304
+
1305
+ cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>
1306
+ ... there is no update to address any of the review comments
1307
+ in the thread above.