@matheusbsbs / matheus-bagliano / commits / 0164aa3980

What's cooking (2018/09 #03)

Junio C Hamano committed Sep 14, 2018 at 14:41 UTC 0164aa39800b78049ce5e494dd3075e05b8ef32a
1 file changed +461 -164
whats-cooking.txt
+461 -164
@@ -1,10 +1,10 @@
1 To: git@vger.kernel.org
2 Bcc: lwn@lwn.net
3 -Subject: What's cooking in git.git (Sep 2018, #02; Tue, 11)
3 +Subject: What's cooking in git.git (Sep 2018, #03; Fri, 14)
4 X-master-at: 1d4361b0f344188ab5eec6dcea01f61a3a3a1670
5 -X-next-at: e8095fc6352aeb4e2deee7c9f2e1aeda5253cc31
5 +X-next-at: 18242da7ef2827fb2713d17d95e46d20630f67d2
6
7 -What's cooking in git.git (Sep 2018, #02; Tue, 11)
7 +What's cooking in git.git (Sep 2018, #03; Fri, 14)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with
@@ -12,10 +12,17 @@ Here are the topics that have been cooking. Commits prefixed with
12 '+' are in 'next'. The ones marked with '.' do not appear in any of
13 the integration branches, but I am still holding onto them.
14
15 -Git 2.19 is out. The tip of 'next' has not been rewound yet; it is
16 -a rare occasion for topics that would want to restart from a clean
17 -slate to do so, so please raise your hand if you think that a topic
18 -that is in 'next' should be ejected and given a chance to restart.
15 +The tip of 'next' hasn't been rewound yet, but the states of many
16 +topics that were marked to "Cook in 'next'" read "Will merge to
17 +'master'" now. I'll probably start merging a handful of topics that
18 +have been in 'next' down to 'master' tonight (they appear at the
19 +bottom of "log --first-parent master..pu" output).
20 +
21 +The three GSoC "rewrite in C" topics are still unclassified in this
22 +"What's cooking" report, but I am hoping that we can have them in
23 +'next' sooner rather than later. I got an impression that Dscho
24 +wanted a chance for the final clean-up on some of them, so I am not
25 +doing anything hasty yet at this moment, though.
26
27 You can find the changes described here in the integration branches
28 of the repositories listed at
@@ -25,87 +32,252 @@ of the repositories listed at
32 --------------------------------------------------
33 [New Topics]
34
28 -* ab/commit-graph-progress (2018-09-11) 2 commits
29 - - commit-graph verify: add progress output
30 - - commit-graph write: add progress output
35 +* ab/fsck-skiplist (2018-09-12) 10 commits
36 + - fsck: support comments & empty lines in skipList
37 + - fsck: use oidset instead of oid_array for skipList
38 + - fsck: use strbuf_getline() to read skiplist file
39 + - fsck: add a performance test for skipList
40 + - fsck: add a performance test
41 + - fsck: document that skipList input must be unabbreviated
42 + - fsck: document and test commented & empty line skipList input
43 + - fsck: document and test sorted skipList input
44 + - fsck tests: add a test for no skipList input
45 + - fsck tests: setup of bogus commit object
46
47 + Update fsck.skipList implementation and documentation.
48
33 -* bw/protocol-v2 (2018-09-10) 1 commit
34 - - config: document value 2 for protocol.version
49 + Will merge to 'next'.
50
51
37 -* en/double-semicolon-fix (2018-09-05) 1 commit
38 - - Remove superfluous trailing semicolons
52 +* bc/hash-independent-tests (2018-09-13) 12 commits
53 + - t5318: use test_oid for HASH_LEN
54 + - t1407: make hash size independent
55 + - t1406: make hash-size independent
56 + - t1405: make hash size independent
57 + - t1400: switch hard-coded object ID to variable
58 + - t1006: make hash size independent
59 + - t0064: make hash size independent
60 + - t0027: make hash size independent
61 + - t0002: abstract away SHA-1 specific constants
62 + - t0000: update tests for SHA-256
63 + - t0000: use hash translation table
64 + - t: add test functions to translate hash-related values
65
66 + Various tests have been updated to make it easier to swap the
67 + hash function used for object identification.
68
41 -* en/rerere-multi-stage-1-fix (2018-09-11) 2 commits
42 - - rerere: avoid buffer overrun
43 - - t4200: demonstrate rerere segfault on specially crafted merge
69 + Will merge to 'next'.
70
71
46 -* jc/wt-status-state-cleanup (2018-09-07) 1 commit
47 - - WIP: roll wt_status_state into wt_status and populate in the collect phase
48 - (this branch uses ss/wt-status-committable.)
72 +* bp/mv-submodules-with-fsmonitor (2018-09-12) 1 commit
73 + - git-mv: allow submodules and fsmonitor to work together
74
75 + When fsmonitor is in use, after operation on submodules updates
76 + .gitmodules, we lost track of the fact that we did so and relied on
77 + stale fsmonitor data.
78
51 -* jk/dev-build-format-security (2018-09-11) 1 commit
52 - - config.mak.dev: add -Wformat-security
79 + Will merge to 'next'.
80
81
55 -* jk/reopen-tempfile-truncate (2018-09-05) 1 commit
56 - - reopen_tempfile(): truncate opened file
82 +* bp/read-cache-parallel (2018-09-13) 6 commits
83 + - SQUASH???
84 + - read-cache: clean up casting and byte decoding
85 + - read-cache.c: optimize reading index format v4
86 + - read-cache: load cache entries on worker threads
87 + - read-cache: load cache extensions on a worker thread
88 + - eoie: add End of Index Entry (EOIE) extension
89
90 + A new extension to the index file has been introduced, which allows
91 + the file to be read in parallel.
92
59 -* jn/http-backend-content-length (2018-09-11) 2 commits
60 - - SQUASH???? perhaps after reflowing
61 - - http-backend: treat empty CONTENT_LENGTH as zero
93 + Will merge to 'next' after squashing the fix in.
94
95
64 -* js/mingw-o-append (2018-09-11) 2 commits
65 - - mingw: fix mingw_open_append to work with named pipes
66 - - t0051: test GIT_TRACE to a windows named pipe
96 +* ds/coverage-diff (2018-09-12) 1 commit
97 + - contrib: add coverage-diff script
98
99 + The result of coverage test can be combined with "git blame" to
100 + check the test coverage of code introduced recently with a new
101 + 'coverage-diff' tool (in contrib/).
102
69 -* mk/http-backend-content-length (2018-09-11) 1 commit
70 - (merged to 'next' on 2018-09-11 at e8095fc635)
71 - + http-backend test: make empty CONTENT_LENGTH test more realistic
103 + Expecting a reroll.
104
105
74 -* nd/test-tool (2018-09-11) 6 commits
75 - - Makefile: add a hint about TEST_BUILTINS_OBJS
76 - - t/helper: merge test-dump-fsmonitor into test-tool
77 - - t/helper: merge test-parse-options into test-tool
78 - - t/helper: merge test-pkt-line into test-tool
79 - - t/helper: merge test-dump-untracked-cache into test-tool
80 - - t/helper: keep test-tool command list sorted
106 +* ds/format-patch-range-diff-test (2018-09-12) 1 commit
107 + - t3206-range-diff.sh: cover single-patch case
108 + (this branch uses es/format-patch-interdiff and es/format-patch-rangediff.)
109
110 + Will merge to 'next'.
111
83 -* sb/diff-color-move-more (2018-09-11) 1 commit
84 - - diff: fix --color-moved-ws=allow-indentation-change
112
113 +* ds/multi-pack-verify (2018-09-13) 11 commits
114 + - fsck: verify multi-pack-index
115 + - multi-pack-index: report progress during 'verify'
116 + - multi-pack-index: verify object offsets
117 + - multi-pack-index: fix 32-bit vs 64-bit size check
118 + - multi-pack-index: verify oid lookup order
119 + - multi-pack-index: verify oid fanout order
120 + - multi-pack-index: verify missing pack
121 + - multi-pack-index: verify packname order
122 + - multi-pack-index: verify corrupt chunk lookup table
123 + - multi-pack-index: verify bad header
124 + - multi-pack-index: add 'verify' verb
125 + (this branch uses ds/multi-pack-index.)
126
87 -* sb/string-list-remove-unused (2018-09-11) 1 commit
88 - - string-list: remove unused function print_string_list
127 + "git multi-pack-index" learned to detect corruption in the .midx
128 + file it uses, and this feature has been integrated into "git fsck".
129
130 + Will merge to 'next'.
131
91 -* sg/t3701-tighten-trace (2018-09-11) 1 commit
92 - - t3701-add-interactive: tighten the check of trace output
132
133 +* en/sequencer-empty-edit-result-aborts (2018-09-13) 1 commit
134 + - sequencer: fix --allow-empty-message behavior, make it smarter
135
95 -* ss/wt-status-committable (2018-09-07) 4 commits
96 - - wt-status.c: set the committable flag in the collect phase
97 - - t7501: add test of "commit --dry-run --short"
98 - - wt-status: rename commitable to committable
99 - - wt-status.c: move has_unmerged earlier in the file
100 - (this branch is used by jc/wt-status-state-cleanup.)
136 + "git rebase" etc. in Git 2.19 fails to abort when given an empty
137 + commit log message as result of editing, which has been corrected.
138
139 + Will merge to 'next'.
140
103 -* tz/t5551-with-curl-7.61.1 (2018-09-11) 1 commit
104 - - t5551-http-fetch-smart.sh: sort cookies before comparing
141 +
142 +* en/update-ref-no-deref-stdin (2018-09-12) 2 commits
143 + - update-ref: allow --no-deref with --stdin
144 + - update-ref: fix type of update_flags variable to match its usage
145 +
146 + "git update-ref" learned to make both "--no-deref" and "--stdin"
147 + work at the same time.
148 +
149 + Will merge to 'next'.
150 +
151 +
152 +* jt/lazy-object-fetch-fix (2018-09-13) 2 commits
153 + - fetch-object: set exact_oid when fetching
154 + - fetch-object: unify fetch_object[s] functions
155 +
156 + The code to backfill objects in lazily cloned repository did not
157 + work correctly, which has been corrected.
158 +
159 + Will merge to 'next'.
160 +
161 +
162 +* ms/remote-error-message-update (2018-09-14) 1 commit
163 + - builtin/remote: quote remote name on error to display empty name
164 +
165 + Update error messages given by "git remote" and make them consistent.
166 +
167 + Will merge to 'next'.
168 +
169 +
170 +* nd/config-split (2018-09-12) 11 commits
171 + - config.txt: move submodule part out to a separate file
172 + - config.txt: move sequence.editor out of "core" part
173 + - config.txt: move sendemail part out to a separate file
174 + - config.txt: move receive part out to a separate file
175 + - config.txt: move push part out to a separate file
176 + - config.txt: move pull part out to a separate file
177 + - config.txt: move gui part out to a separate file
178 + - config.txt: move gitcvs part out to a separate file
179 + - config.txt: move format part out to a separate file
180 + - config.txt: move fetch part out to a separate file
181 + - config.txt: follow camelCase naming
182 +
183 + Split Documentation/config.txt for easier maintenance.
184 +
185 + Will merge to 'next'.
186 +
187 +
188 +* sb/submodule-recursive-fetch-gets-the-tip (2018-09-12) 9 commits
189 + - builtin/fetch: check for submodule updates for non branch fetches
190 + - fetch: retry fetching submodules if sha1 were not fetched
191 + - submodule: fetch in submodules git directory instead of in worktree
192 + - submodule.c: do not copy around submodule list
193 + - submodule: move global changed_submodule_names into fetch submodule struct
194 + - submodule.c: sort changed_submodule_names before searching it
195 + - submodule.c: fix indentation
196 + - sha1-array: provide oid_array_filter
197 + - string-list: add string_list_{pop, last} functions
198 +
199 + "git fetch --recurse-submodules" may not fetch the necessary commit
200 + that is bound to the superproject, which is getting corrected.
201 +
202 + Expecting a reroll.
203 + cf. <CAGZ79kbavjVbTqXsmtjW6=jhkq47_p3mc6=92xOp4_mfhqDtvw@mail.gmail.com>
204 + cf. <b16af8c0-0435-0de4-ed6c-53888d6190af@ramsayjones.plus.com>
205 + cf. <CAGZ79kZKKf9N8yx9EuCRZhrZS_mA2218PouEG7aHDhK2bJGEdA@mail.gmail.com>
206 +
207 +
208 +* sg/split-index-test (2018-09-12) 2 commits
209 + - t0090: disable GIT_TEST_SPLIT_INDEX for the test checking split index
210 + - t1700-split-index: drop unnecessary 'grep'
211 +
212 + Test updates.
213 +
214 + Will merge to 'next'.
215 +
216 +
217 +* tb/void-check-attr (2018-09-12) 1 commit
218 + - Make git_check_attr() a void function
219 +
220 + Code clean-up.
221 +
222 + Will merge to 'next'.
223 +
224 +
225 +* tg/range-diff-corner-case-fix (2018-09-14) 1 commit
226 + - linear-assignment: fix potential out of bounds memory access
227 +
228 + Recently added "range-diff" had a corner-case bug to cause it
229 + segfault, which has been corrected.
230 +
231 + Will merge to 'next'.
232 +
233 +
234 +* bp/rename-test-env-var (2018-09-14) 5 commits
235 + - preload-index: update GIT_FORCE_PRELOAD_TEST support
236 + - read-cache: update TEST_GIT_INDEX_VERSION support
237 + - fsmonitor: update GIT_TEST_FSMONITOR support
238 + - preload-index: teach GIT_FORCE_PRELOAD_TEST to take a boolean
239 + - correct typo/spelling error in t/README
240 +
241 + Some environment variables that control the runtime options of Git
242 + used during tests are getting renamed for consistency.
243 +
244 + Will merge to 'next'.
245
246 --------------------------------------------------
247 [Stalled]
248
249 +* bw/submodule-name-to-dir (2018-08-10) 2 commits
250 + (merged to 'next' on 2018-08-22 at c17f83be24)
251 + + submodule: munge paths to submodule git directories
252 + + submodule: create helper to build paths to submodule gitdirs
253 +
254 + In modern repository layout, the real body of a cloned submodule
255 + repository is held in .git/modules/ of the superproject, indexed by
256 + the submodule name. URLencode the submodule name before computing
257 + the name of the directory to make sure they form a flat namespace.
258 +
259 + Will eject out of 'next', expecting further work on the topic.
260 + cf. <CAGZ79kYnbjaPoWdda0SM_-_X77mVyYC7JO61OV8nm2yj3Q1OvQ@mail.gmail.com>
261 +
262 +
263 +* ng/status-i-short-for-ignored (2018-08-09) 1 commit
264 + - status: -i shorthand for --ignored command line option
265 +
266 + "git status --ignored" gained a shorthand "git status -i".
267 +
268 + Will discard, after hearing no strong support.
269 + What's the list opinion on this one? It is Meh to me, but
270 + obviously the author cared enough to write a patch, so...
271 +
272 +
273 +* sb/submodule-move-head-with-corruption (2018-08-28) 2 commits
274 + - submodule.c: warn about missing submodule git directories
275 + - t2013: add test for missing but active submodule
276 +
277 + Will discard and wait for a cleaned-up rewrite.
278 + cf. <20180907195349.GA103699@aiede.svl.corp.google.com>
279 +
280 +
281 * sl/commit-dry-run-with-short-output-fix (2018-07-30) 4 commits
282 . commit: fix exit code when doing a dry run
283 . wt-status: teach wt_status_collect about merges in progress
@@ -186,16 +358,153 @@ of the repositories listed at
358 --------------------------------------------------
359 [Cooking]
360
361 +* ab/commit-graph-progress (2018-09-11) 2 commits
362 + - commit-graph verify: add progress output
363 + - commit-graph write: add progress output
364 +
365 + Generation of (expermental) commit-graph files have so far been
366 + fairly silent, even though it takes noticeable amount of time in a
367 + meaningfully large repository. The users will now see progress
368 + output.
369 +
370 + Will merge to 'next'.
371 +
372 +
373 +* bw/protocol-v2 (2018-09-10) 1 commit
374 + - config: document value 2 for protocol.version
375 +
376 + Doc fix.
377 +
378 + Will merge to 'next'.
379 +
380 +
381 +* en/double-semicolon-fix (2018-09-05) 1 commit
382 + - Remove superfluous trailing semicolons
383 +
384 + Code clean-up.
385 +
386 + Will merge to 'next'.
387 +
388 +
389 +* en/rerere-multi-stage-1-fix (2018-09-11) 2 commits
390 + - rerere: avoid buffer overrun
391 + - t4200: demonstrate rerere segfault on specially crafted merge
392 +
393 + A corner case bugfix in "git rerere" code.
394 +
395 + Will merge to 'next'.
396 +
397 +
398 +* jk/dev-build-format-security (2018-09-11) 1 commit
399 + - config.mak.dev: add -Wformat-security
400 +
401 + Build tweak to help developers.
402 +
403 + Will merge to 'next'.
404 +
405 +
406 +* jk/reopen-tempfile-truncate (2018-09-05) 1 commit
407 + - reopen_tempfile(): truncate opened file
408 +
409 + Fix for a long-standing bug that leaves the index file corrupt when
410 + it shrinks during a partial commit.
411 +
412 + Will merge to 'next'.
413 +
414 +
415 +* js/mingw-o-append (2018-09-11) 2 commits
416 + - mingw: fix mingw_open_append to work with named pipes
417 + - t0051: test GIT_TRACE to a windows named pipe
418 +
419 + Further fix for O_APPEND emulation on Windows
420 +
421 + Will merge to 'next'.
422 +
423 +
424 +* mk/http-backend-content-length (2018-09-11) 1 commit
425 + (merged to 'next' on 2018-09-11 at e8095fc635)
426 + + http-backend test: make empty CONTENT_LENGTH test more realistic
427 +
428 + Test update.
429 +
430 + Will merge to 'master'.
431 +
432 +
433 +* nd/test-tool (2018-09-11) 6 commits
434 + - Makefile: add a hint about TEST_BUILTINS_OBJS
435 + - t/helper: merge test-dump-fsmonitor into test-tool
436 + - t/helper: merge test-parse-options into test-tool
437 + - t/helper: merge test-pkt-line into test-tool
438 + - t/helper: merge test-dump-untracked-cache into test-tool
439 + - t/helper: keep test-tool command list sorted
440 +
441 + Test helper binaries clean-up.
442 +
443 + Will merge to 'next'.
444 +
445 +
446 +* sb/diff-color-move-more (2018-09-11) 1 commit
447 + - diff: fix --color-moved-ws=allow-indentation-change
448 +
449 + Bugfix.
450 +
451 + Will merge to 'next'.
452 +
453 +
454 +* sb/string-list-remove-unused (2018-09-11) 1 commit
455 + - string-list: remove unused function print_string_list
456 +
457 + Code clean-up.
458 +
459 + Will merge to 'next'.
460 +
461 +
462 +* sg/t3701-tighten-trace (2018-09-11) 1 commit
463 + - t3701-add-interactive: tighten the check of trace output
464 +
465 + Test update.
466 +
467 + Will merge to 'next'.
468 +
469 +
470 +* ss/wt-status-committable (2018-09-07) 4 commits
471 + - wt-status.c: set the committable flag in the collect phase
472 + - t7501: add test of "commit --dry-run --short"
473 + - wt-status: rename commitable to committable
474 + - wt-status.c: move has_unmerged earlier in the file
475 + (this branch is used by jc/wt-status-state-cleanup.)
476 +
477 + Code clean-up in the internal machinery used by "git status" and
478 + "git commit --dry-run".
479 +
480 + Will merge to 'next'.
481 +
482 +
483 +* jc/wt-status-state-cleanup (2018-09-07) 1 commit
484 + - WIP: roll wt_status_state into wt_status and populate in the collect phase
485 + (this branch uses ss/wt-status-committable.)
486 +
487 +
488 +
489 +* tz/t5551-with-curl-7.61.1 (2018-09-11) 1 commit
490 + - t5551-http-fetch-smart.sh: sort cookies before comparing
491 +
492 + Test fix.
493 +
494 + Will merge to 'next'.
495 +
496 +
497 * ab/fetch-tags-noclobber (2018-08-31) 9 commits
190 - - fetch: stop clobbering existing tags without --force
191 - - fetch: document local ref updates with/without --force
192 - - push doc: correct lies about how push refspecs work
193 - - push doc: move mention of "tag <tag>" later in the prose
194 - - push doc: remove confusing mention of remote merger
195 - - fetch tests: add a test for clobbering tag behavior
196 - - push tests: use spaces in interpolated string
197 - - push tests: make use of unused $1 in test description
198 - - fetch: change "branch" to "reference" in --force -h output
498 + (merged to 'next' on 2018-09-14 at 0384a7a8b4)
499 + + fetch: stop clobbering existing tags without --force
500 + + fetch: document local ref updates with/without --force
501 + + push doc: correct lies about how push refspecs work
502 + + push doc: move mention of "tag <tag>" later in the prose
503 + + push doc: remove confusing mention of remote merger
504 + + fetch tests: add a test for clobbering tag behavior
505 + + push tests: use spaces in interpolated string
506 + + push tests: make use of unused $1 in test description
507 + + fetch: change "branch" to "reference" in --force -h output
508
509 The rules used by "git push" and "git fetch" to determine if a ref
510 can or cannot be updated were inconsistent; specifically, fetching
@@ -203,55 +512,59 @@ of the repositories listed at
512 to be unmoving anchoring points. "git fetch" was taught to forbid
513 updates to existing tags without the "--force" option.
514
206 - Will merge to and cook in 'next'.
515 + Will merge to 'master'.
516 This is a backward incompatible change but in a good way; it may
517 still need to be treated carefully.
518
519
520 * es/worktree-forced-ops-fix (2018-09-05) 10 commits
212 - - doc-diff: force worktree add
213 - - worktree: delete .git/worktrees if empty after 'remove'
214 - - worktree: teach 'remove' to override lock when --force given twice
215 - - worktree: teach 'move' to override lock when --force given twice
216 - - worktree: teach 'add' to respect --force for registered but missing path
217 - - worktree: disallow adding same path multiple times
218 - - worktree: prepare for more checks of whether path can become worktree
219 - - worktree: generalize delete_git_dir() to reduce code duplication
220 - - worktree: move delete_git_dir() earlier in file for upcoming new callers
221 - - worktree: don't die() in library function find_worktree()
521 + (merged to 'next' on 2018-09-14 at 1a0cc3204d)
522 + + doc-diff: force worktree add
523 + + worktree: delete .git/worktrees if empty after 'remove'
524 + + worktree: teach 'remove' to override lock when --force given twice
525 + + worktree: teach 'move' to override lock when --force given twice
526 + + worktree: teach 'add' to respect --force for registered but missing path
527 + + worktree: disallow adding same path multiple times
528 + + worktree: prepare for more checks of whether path can become worktree
529 + + worktree: generalize delete_git_dir() to reduce code duplication
530 + + worktree: move delete_git_dir() earlier in file for upcoming new callers
531 + + worktree: don't die() in library function find_worktree()
532
533 Fix a bug in which the same path could be registered under multiple
534 worktree entries if the path was missing (for instance, was removed
535 manually). Also, as a convenience, expand the number of cases in
536 which --force is applicable.
537
228 - Will merge to 'next'.
538 + Will merge to 'master'.
539
540
541 * jk/patch-corrupted-delta-fix (2018-08-30) 6 commits
232 - - t5303: use printf to generate delta bases
233 - - patch-delta: handle truncated copy parameters
234 - - patch-delta: consistently report corruption
235 - - patch-delta: fix oob read
236 - - t5303: test some corrupt deltas
237 - - test-delta: read input into a heap buffer
542 + (merged to 'next' on 2018-09-14 at 7517309cb0)
543 + + t5303: use printf to generate delta bases
544 + + patch-delta: handle truncated copy parameters
545 + + patch-delta: consistently report corruption
546 + + patch-delta: fix oob read
547 + + t5303: test some corrupt deltas
548 + + test-delta: read input into a heap buffer
549
550 Malformed or crafted data in packstream can make our code attempt
551 to read or write past the allocated buffer and abort, instead of
552 reporting an error, which has been fixed.
553
243 - Will merge to 'next'.
554 + Will merge to 'master'.
555
556
557 * jk/pack-objects-with-bitmap-fix (2018-09-04) 4 commits
247 - - pack-bitmap: drop "loaded" flag
248 - - traverse_bitmap_commit_list(): don't free result
249 - - t5310: test delta reuse with bitmaps
250 - - bitmap_has_sha1_in_uninteresting(): drop BUG check
558 + (merged to 'next' on 2018-09-14 at 392eb2abb1)
559 + + pack-bitmap: drop "loaded" flag
560 + + traverse_bitmap_commit_list(): don't free result
561 + + t5310: test delta reuse with bitmaps
562 + + bitmap_has_sha1_in_uninteresting(): drop BUG check
563 (this branch uses jk/pack-delta-reuse-with-bitmap.)
564
253 - Hotfix of the base topic. It may not be a bad idea to squash these
254 - in when the next development cycle opens.
565 + Hotfix of the base topic.
566 +
567 + Will merge to 'master'.
568
569
570 * js/rebase-i-autosquash-fix (2018-09-04) 2 commits
@@ -266,29 +579,21 @@ of the repositories listed at
579
580
581 * nd/bisect-show-list-fix (2018-09-04) 1 commit
269 - - bisect.c: make show_list() build again
582 + (merged to 'next' on 2018-09-14 at 18242da7ef)
583 + + bisect.c: make show_list() build again
584
585 Debugging aid update.
586
273 - Will merge to and cook in 'next'.
274 -
275 -
276 -* nd/optim-reading-index-v4 (2018-09-04) 1 commit
277 - - read-cache.c: optimize reading index format v4
278 -
279 - The v4 format of the index file uses prefix compression to store
280 - the pathnames to save file size. The codepath to read such a file
281 - has been optimized.
282 -
283 - Will merge to and cook in 'next'.
587 + Will merge to 'master'.
588
589
590 * sg/doc-trace-appends (2018-09-04) 1 commit
287 - - Documentation/git.txt: clarify that GIT_TRACE=/path appends
591 + (merged to 'next' on 2018-09-14 at 6d82abb8bf)
592 + + Documentation/git.txt: clarify that GIT_TRACE=/path appends
593
594 Docfix.
595
291 - Will merge to 'next'.
596 + Will merge to 'master'.
597
598
599 * ds/format-commit-graph-docs (2018-08-21) 2 commits
@@ -298,18 +603,23 @@ of the repositories listed at
603 Design docs for the commit-graph machinery is now made into HTML as
604 well as text.
605
606 + Will discard.
607 + I am inclined to drop these, as I do not see much clarity in HTML
608 + output over the text source. Opinions?
609 +
610
611 * jk/diff-rendered-docs (2018-08-31) 5 commits
303 - - doc/Makefile: drop doc-diff worktree and temporary files on "make clean"
304 - - doc-diff: add --clean mode to remove temporary working gunk
305 - - doc-diff: fix non-portable 'man' invocation
306 - - doc-diff: always use oids inside worktree
612 + (merged to 'next' on 2018-09-14 at 9b43d5a568)
613 + + doc/Makefile: drop doc-diff worktree and temporary files on "make clean"
614 + + doc-diff: add --clean mode to remove temporary working gunk
615 + + doc-diff: fix non-portable 'man' invocation
616 + + doc-diff: always use oids inside worktree
617 (merged to 'next' on 2018-08-22 at dd7a2b71cd)
618 + SubmittingPatches: mention doc-diff
619
620 Dev doc update.
621
312 - Will merge to 'next'.
622 + Will merge to 'master'.
623
624
625 * jk/pack-delta-reuse-with-bitmap (2018-08-21) 6 commits
@@ -328,7 +638,7 @@ of the repositories listed at
638 take advantage of the reachability bitmap; this allows the server
639 to send a delta against a base beyond the "boundary" commit.
640
331 - Will cook in 'next'.
641 + Will merge to 'master'.
642
643
644 * jk/rev-list-stdin-noop-is-ok (2018-08-22) 1 commit
@@ -340,7 +650,7 @@ of the repositories listed at
650 still falls back to the given default when nothing is given on the
651 standard input.
652
343 - Will cook in 'next'.
653 + Will merge to 'master'.
654
655
656 * js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-09-06) 2 commits
@@ -369,7 +679,7 @@ of the repositories listed at
679 which triggered in various codepaths that will always get the log
680 message alone and never get such an input.
681
372 - Will cook in 'next'.
682 + Will merge to 'master'.
683
684
685 * tg/rerere-doc-updates (2018-08-29) 2 commits
@@ -380,15 +690,16 @@ of the repositories listed at
690
691 Clarify a part of technical documentation for rerere.
692
383 - Will cook in 'next'.
693 + Will merge to 'master'.
694
695
696 * ds/commit-graph-tests (2018-08-29) 1 commit
387 - - commit-graph: define GIT_TEST_COMMIT_GRAPH
697 + (merged to 'next' on 2018-09-14 at d072a0ee3e)
698 + + commit-graph: define GIT_TEST_COMMIT_GRAPH
699
700 We can now optionally run tests with commit-graph enabled.
701
391 - Will merge to 'next'.
702 + Will merge to 'master'.
703
704
705 * jk/cocci (2018-08-29) 9 commits
@@ -407,7 +718,7 @@ of the repositories listed at
718 newly introduced oideq() is added, and applied, to regain
719 performance lost due to support of multiple hash algorithms.
720
410 - Will cook in 'next'.
721 + Will merge to 'master'.
722
723
724 * js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
@@ -428,14 +739,7 @@ of the repositories listed at
739 recovery of a patch corrupted by MUA that sends text/plain with
740 format=flawed option.
741
431 - Will cook in 'next'.
432 -
433 -
434 -* sb/submodule-move-head-with-corruption (2018-08-28) 2 commits
435 - - submodule.c: warn about missing submodule git directories
436 - - t2013: add test for missing but active submodule
437 -
438 - cf. <20180905191849.GB120842@aiede.svl.corp.google.com>
742 + Will merge to 'master'.
743
744
745 * tg/conflict-marker-size (2018-08-29) 1 commit
@@ -444,7 +748,7 @@ of the repositories listed at
748
749 Developer aid.
750
447 - Will cook in 'next'.
751 + Will merge to 'master'.
752
753
754 * ts/doc-build-manpage-xsl-quietly (2018-08-29) 1 commit
@@ -453,7 +757,7 @@ of the repositories listed at
757
758 Build tweak.
759
456 - Will cook in 'next'.
760 + Will merge to 'master'.
761
762
763 * bp/checkout-new-branch-optim (2018-08-16) 1 commit
@@ -464,7 +768,7 @@ of the repositories listed at
768 checking out a commit different from HEAD. An attempt is made to
769 optimize this special case.
770
467 - Will cook in 'next'.
771 + Will merge to 'master'.
772
773
774 * ao/submodule-wo-gitmodules-checked-out (2018-08-14) 7 commits
@@ -487,20 +791,6 @@ of the repositories listed at
791 from the index, not from the HEAD.
792
793
490 -* bw/submodule-name-to-dir (2018-08-10) 2 commits
491 - (merged to 'next' on 2018-08-22 at c17f83be24)
492 - + submodule: munge paths to submodule git directories
493 - + submodule: create helper to build paths to submodule gitdirs
494 -
495 - In modern repository layout, the real body of a cloned submodule
496 - repository is held in .git/modules/ of the superproject, indexed by
497 - the submodule name. URLencode the submodule name before computing
498 - the name of the directory to make sure they form a flat namespace.
499 -
500 - Expecting further work on the topic.
501 - cf. <CAGZ79kYnbjaPoWdda0SM_-_X77mVyYC7JO61OV8nm2yj3Q1OvQ@mail.gmail.com>
502 -
503 -
794 * cc/delta-islands (2018-08-16) 7 commits
795 (merged to 'next' on 2018-08-27 at cf3d7bd93f)
796 + pack-objects: move 'layer' into 'struct packing_data'
@@ -515,10 +805,10 @@ of the repositories listed at
805 object that exists in one fork is not made into a delta against
806 another object that does not appear in the same forked repository.
807
518 - Will cook in 'next'.
808 + Will merge to 'master'.
809
810
521 -* md/filter-trees (2018-09-04) 7 commits
811 +* md/filter-trees (2018-09-14) 7 commits
812 - list-objects-filter: implement filter tree:0
813 - list-objects-filter: use BUG rather than die
814 - revision: mark non-user-given objects instead
@@ -531,15 +821,7 @@ of the repositories listed at
821 "tree:0" filter.
822
823 Will merge to 'next'.
534 -
535 -
536 -* ng/status-i-short-for-ignored (2018-08-09) 1 commit
537 - - status: -i shorthand for --ignored command line option
538 -
539 - "git status --ignored" gained a shorthand "git status -i".
540 -
541 - What's the list opinion on this one? It is Meh to me, but
542 - obviously the author cared enough to write a patch, so...
824 + The test scripts need to be cleaned up.
825
826
827 * pk/rebase-in-c-2-basic (2018-09-06) 11 commits
@@ -638,7 +920,7 @@ of the repositories listed at
920 underlying filesystem is incapable of holding both at the same
921 time. An attempt is made to detect such a case and warn.
922
641 - Will cook in 'next'.
923 + Will merge to 'master'.
924
925
926 * nd/unpack-trees-with-cache-tree (2018-08-27) 8 commits
@@ -661,7 +943,7 @@ of the repositories listed at
943 open tree objects recursively and listing their entries, the walk
944 can be optimized, which is done in this topic.
945
664 - Will cook in 'next'.
946 + Will merge to 'master'.
947
948
949 * sb/range-diff-colors (2018-08-20) 11 commits
@@ -681,7 +963,7 @@ of the repositories listed at
963 The color output support for recently introduced "range-diff"
964 command got tweaked a bit.
965
684 - Will cook in 'next'.
966 + Will merge to 'master'.
967
968
969 * sg/t1404-update-ref-test-timeout (2018-08-01) 1 commit
@@ -690,7 +972,7 @@ of the repositories listed at
972
973 An attempt to unflake a test a bit.
974
693 - Will cook in 'next'.
975 + Will merge to 'master'.
976
977
978 * pw/add-p-select (2018-07-26) 4 commits
@@ -755,7 +1037,7 @@ of the repositories listed at
1037 obtained a bunch of new tests to cover them, and then being
1038 improved.
1039
758 - Will cook in 'next'.
1040 + Will merge to 'master'.
1041
1042
1043 * es/format-patch-interdiff (2018-07-23) 6 commits
@@ -766,13 +1048,13 @@ of the repositories listed at
1048 + format-patch: teach --interdiff to respect -v/--reroll-count
1049 + format-patch: add --interdiff option to embed diff in cover letter
1050 + format-patch: allow additional generated content in make_cover_letter()
769 - (this branch is used by es/format-patch-rangediff.)
1051 + (this branch is used by ds/format-patch-range-diff-test and es/format-patch-rangediff.)
1052
1053 "git format-patch" learned a new "--interdiff" option to explain
1054 the difference between this version and the previous atttempt in
1055 the cover letter (or after the tree-dashes as a comment).
1056
775 - Will cook in 'next'.
1057 + Will merge to 'master'.
1058
1059
1060 * es/format-patch-rangediff (2018-08-14) 10 commits
@@ -787,13 +1069,13 @@ of the repositories listed at
1069 + range-diff: respect diff_option.file rather than assuming 'stdout'
1070 + Merge branch 'es/format-patch-interdiff' into es/format-patch-rangediff
1071 + Merge branch 'js/range-diff' into es/format-patch-rangediff
790 - (this branch uses es/format-patch-interdiff.)
1072 + (this branch is used by ds/format-patch-range-diff-test; uses es/format-patch-interdiff.)
1073
1074 "git format-patch" learned a new "--range-diff" option to explain
1075 the difference between this version and the previous attempt in
1076 the cover letter (or after the tree-dashes as a comment).
1077
796 - Will cook in 'next'.
1078 + Will merge to 'master'.
1079
1080
1081 * jn/gc-auto (2018-07-17) 3 commits
@@ -824,7 +1106,7 @@ of the repositories listed at
1106
1107 "git submodule update" is getting rewritten piece-by-piece into C.
1108
827 - Will cook in 'next'.
1109 + Will merge to 'master'.
1110
1111
1112 * tg/rerere (2018-08-06) 11 commits
@@ -845,7 +1127,7 @@ of the repositories listed at
1127 Fixes to "git rerere" corner cases, especially when conflict
1128 markers cannot be parsed in the file.
1129
848 - Will cook in 'next'.
1130 + Will merge to 'master'.
1131
1132
1133 * ag/rebase-i-in-c (2018-08-29) 20 commits
@@ -901,7 +1183,7 @@ of the repositories listed at
1183
1184 Updated plan to repurpose the "-l" option to "git branch".
1185
904 - Will cook in 'next'.
1186 + Will merge to 'master'.
1187
1188
1189 * ds/multi-pack-index (2018-08-20) 33 commits
@@ -940,13 +1222,14 @@ of the repositories listed at
1222 + multi-pack-index: add builtin
1223 + multi-pack-index: add format details
1224 + multi-pack-index: add design document
1225 + (this branch is used by ds/multi-pack-verify.)
1226
1227 When there are too many packfiles in a repository (which is not
1228 recommended), looking up an object in these would require
1229 consulting many pack .idx files; a new mechanism to have a single
1230 file that consolidates all of these .idx files is introduced.
1231
949 - Will cook in 'next'.
1232 + Will merge to 'master'.
1233
1234 --------------------------------------------------
1235 [Discarded]
@@ -1051,4 +1334,18 @@ of the repositories listed at
1334
1335 The fix has been rolled into the original topic that introduced the
1336 issue, hence this topic is no longer necessary.
1054 -
1337 +
1338 +
1339 +* jn/http-backend-content-length (2018-09-11) 2 commits
1340 + . SQUASH???? perhaps after reflowing
1341 + . http-backend: treat empty CONTENT_LENGTH as zero
1342 +
1343 +
1344 +* nd/optim-reading-index-v4 (2018-09-04) 1 commit
1345 + . read-cache.c: optimize reading index format v4
1346 +
1347 + The v4 format of the index file uses prefix compression to store
1348 + the pathnames to save file size. The codepath to read such a file
1349 + has been optimized.
1350 +
1351 + Absorbed in bp/read-cache-parallel topic.