@matheusbsbs / matheus-bagliano / commits / 52f72e3b76

What's cooking (2018/08 #06)

Junio C Hamano committed Aug 29, 2018 at 15:33 UTC 52f72e3b76763c6eeb47e648da25b3ecc59cc98b
1 file changed +406 -403
whats-cooking.txt
+406 -403
@@ -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, #05; Mon, 20)
4 -X-master-at: 7e8bfb0412581daf8f3c89909f1d37844e8610dd
5 -X-next-at: 281dcd1b4d06be64a0a976ddb7172bf180b74c09
3 +Subject: What's cooking in git.git (Aug 2018, #06; Wed, 29)
4 +X-master-at: 2f743933341f276111103550fbf383a34dfcfd38
5 +X-next-at: b1634b371dc2e46f9b43c45fd1857c2e2688f96e
6
7 -What's cooking in git.git (Aug 2018, #05; Mon, 20)
7 +What's cooking in git.git (Aug 2018, #06; Wed, 29)
8 --------------------------------------------------
9
10 Here are the topics that have been cooking. Commits prefixed with
@@ -12,9 +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 -An early preview of the upcoming 2.19 release of Git has been tagged
16 -as v2.19.0-rc0; before -rc1, I plan to merge three more topics to
17 -'master' from 'next'.
15 +Git 2.19-rc1 is out. Hopefully the tip of 'master' is more or less
16 +identical to the final one without needing much updates.
17
18 You can find the changes described here in the integration branches
19 of the repositories listed at
@@ -24,358 +23,380 @@ of the repositories listed at
23 --------------------------------------------------
24 [Graduated to "master"]
25
27 -* ab/checkout-default-remote (2018-08-18) 1 commit
28 - (merged to 'next' on 2018-08-20 at 21fff26f74)
29 - + t2024: mark test using "checkout -p" with PERL prerequisite
26 +* ab/test-must-be-empty-for-master (2018-08-22) 1 commit
27 + (merged to 'next' on 2018-08-22 at 580dfd1024)
28 + + t6018-rev-list-glob: fix 'empty stdin' test
29 + (this branch is used by jk/rev-list-stdin-noop-is-ok.)
30
31 - Test fix.
31 + Test fixes.
32
33
34 -* ab/fetch-tags-noclobber (2018-08-13) 7 commits
35 - (merged to 'next' on 2018-08-15 at eca0ac8afa)
36 - + pull doc: fix a long-standing grammar error
37 - + fetch tests: correct a comment "remove it" -> "remove them"
38 - + push tests: assert re-pushing annotated tags
39 - + push tests: add more testing for forced tag pushing
40 - + push tests: fix logic error in "push" test assertion
41 - + push tests: remove redundant 'git push' invocation
42 - + fetch tests: change "Tag" test tag to "testTag"
34 +* ab/unconditional-free-and-null (2018-08-17) 1 commit
35 + (merged to 'next' on 2018-08-22 at 2661a3cb96)
36 + + refactor various if (x) FREE_AND_NULL(x) to just FREE_AND_NULL(x)
37
44 - Test and doc clean-ups.
38 + Code clean-up.
39
40
47 -* ab/newhash-is-sha256 (2018-08-07) 2 commits
48 - (merged to 'next' on 2018-08-15 at 2e808d75d3)
49 - + doc hash-function-transition: pick SHA-256 as NewHash
50 - + doc hash-function-transition: note the lack of a changelog
41 +* ds/commit-graph-fsck (2018-08-23) 1 commit
42 + (merged to 'next' on 2018-08-23 at cb27eada82)
43 + + config: fix commit-graph related config docs
44
52 - Documentation update.
45 + Finishing touches to doc.
46
47
55 -* ab/submodule-relative-url-tests (2018-08-14) 1 commit
56 - (merged to 'next' on 2018-08-17 at 17b28d8262)
57 - + submodule: add more exhaustive up-path testing
48 +* ep/worktree-quiet-option (2018-08-17) 1 commit
49 + (merged to 'next' on 2018-08-22 at 4a0a85e907)
50 + + worktree: add --quiet option
51
59 - Test updates.
52 + "git worktree" command learned "--quiet" option to make it less
53 + verbose.
54
55
62 -* ab/test-must-be-empty-for-master (2018-07-30) 1 commit
63 - (merged to 'next' on 2018-08-15 at 17652a77fb)
64 - + tests: make use of the test_must_be_empty function
56 +* ja/i18n-message-fixes (2018-08-23) 1 commit
57 + (merged to 'next' on 2018-08-23 at 907c1f69a2)
58 + + i18n: fix mistakes in translated strings
59
66 - Test updates.
60 + Messages fix.
61
62
69 -* ds/commit-graph-fsck (2018-08-13) 1 commit
70 - (merged to 'next' on 2018-08-15 at a2f82d3cbd)
71 - + t5318: use 'test_cmp_bin' to compare commit-graph files
63 +* jk/hashcmp-optim-for-2.19 (2018-08-23) 1 commit
64 + (merged to 'next' on 2018-08-23 at e7e8abe0e3)
65 + + hashcmp: assert constant hash size
66
73 - Test fix.
67 + Partially revert the support for multiple hash functions to regain
68 + hash comparison performance; we'd think of a way to do this better
69 + in the next cycle.
70
71
76 -* en/incl-forward-decl (2018-08-15) 6 commits
77 - (merged to 'next' on 2018-08-17 at 04fc9c11bb)
78 - + Remove forward declaration of an enum
79 - + compat/precompose_utf8.h: use more common include guard style
80 - + urlmatch.h: fix include guard
81 - + Move definition of enum branch_track from cache.h to branch.h
82 - + alloc: make allocate_alloc_state and clear_alloc_state more consistent
83 - + Add missing includes and forward declarations
72 +* jk/use-compat-util-in-test-tool (2018-08-21) 1 commit
73 + (merged to 'next' on 2018-08-22 at 98c3acd8df)
74 + + test-tool.h: include git-compat-util.h
75
85 - Code hygiene improvement for the header files.
76 + Dev tool update.
77
78
88 -* en/t7406-fixes (2018-08-08) 5 commits
89 - (merged to 'next' on 2018-08-15 at c6a740d828)
90 - + t7406: avoid using test_must_fail for commands other than git
91 - + t7406: prefer test_* helper functions to test -[feds]
92 - + t7406: avoid having git commands upstream of a pipe
93 - + t7406: simplify by using diff --name-only instead of diff --raw
94 - + t7406: fix call that was failing for the wrong reason
79 +* js/larger-timestamps (2018-08-21) 1 commit
80 + (merged to 'next' on 2018-08-22 at 23a3d5bcf8)
81 + + commit: use timestamp_t for author_date_slab
82
96 - Test fixes.
83 + Portability fix.
84 +
85 +
86 +* js/range-diff (2018-08-27) 1 commit
87 + (merged to 'next' on 2018-08-27 at ca29413b20)
88 + + range-diff: update stale summary of --no-dual-color
89 +
90 + Finishing touched to help string.
91 +
92 +
93 +* nd/complete-config-vars (2018-08-21) 1 commit
94 + (merged to 'next' on 2018-08-22 at 758f937bef)
95 + + generate-cmdlist.sh: collect config from all config.txt files
96 +
97 + "git help --config" (which is used in command line completion)
98 + missed the configuration variables not described in the main
99 + config.txt file but are described in another file that is included
100 + by it, which has been corrected.
101 +
102 +
103 +* nd/config-core-checkstat-doc (2018-08-17) 1 commit
104 + (merged to 'next' on 2018-08-22 at 3663026a41)
105 + + config.txt: clarify core.checkStat
106
107 + The meaning of the possible values the "core.checkStat"
108 + configuration variable can take were not adequately documented,
109 + which has been fixed.
110 +
111 +
112 +* nd/pack-deltify-regression-fix (2018-07-23) 1 commit
113 + (merged to 'next' on 2018-08-02 at f3b2bf0fef)
114 + + pack-objects: fix performance issues on packing large deltas
115 +
116 + In a recent update in 2.18 era, "git pack-objects" started
117 + producing a larger than necessary packfiles by missing
118 + opportunities to use large deltas, which has been fixed.
119
99 -* en/update-index-doc (2018-08-08) 1 commit
100 - (merged to 'next' on 2018-08-15 at 3ee0ae14dc)
101 - + git-update-index.txt: reword possibly confusing example
120
103 - Doc update.
121 +* rs/opt-updates (2018-08-21) 3 commits
122 + (merged to 'next' on 2018-08-22 at 1703b9b489)
123 + + parseopt: group literal string alternatives in argument help
124 + + remote: improve argument help for add --mirror
125 + + checkout-index: improve argument help for --stage
126
127 + "git cmd -h" updates.
128
106 -* es/chain-lint-more (2018-08-13) 6 commits
107 - (merged to 'next' on 2018-08-15 at bb5150ee96)
108 - + chainlint: add test of pathological case which triggered false positive
109 - + chainlint: recognize multi-line quoted strings more robustly
110 - + chainlint: let here-doc and multi-line string commence on same line
111 - + chainlint: recognize multi-line $(...) when command cuddled with "$("
112 - + chainlint: match 'quoted' here-doc tags
113 - + chainlint: match arbitrary here-docs tags rather than hard-coded names
129
115 - Improve built-in facility to catch broken &&-chain in the tests.
130 +* sg/t0020-conversion-fix (2018-08-22) 1 commit
131 + (merged to 'next' on 2018-08-22 at 79508284c0)
132 + + t0020-crlf: check the right file
133
134 + Test fixes.
135
118 -* hn/highlight-sideband-keywords (2018-08-18) 2 commits
119 - (merged to 'next' on 2018-08-20 at ec6f953f8c)
120 - + sideband: do not read beyond the end of input
121 - (merged to 'next' on 2018-08-15 at f8945f3be5)
122 - + sideband: highlight keywords in remote sideband output
136
124 - The sideband code learned to optionally paint selected keywords at
125 - the beginning of incoming lines on the receiving end.
137 +* sg/t3420-autostash-fix (2018-08-22) 1 commit
138 + (merged to 'next' on 2018-08-22 at 569cf2dc3d)
139 + + t3420-rebase-autostash: don't try to grep non-existing files
140
141 + Test fixes.
142
128 -* jc/gpg-status (2018-08-09) 1 commit
129 - (merged to 'next' on 2018-08-15 at 824781761a)
130 - + gpg-interface: propagate exit status from gpg back to the callers
143
132 - "git verify-tag" and "git verify-commit" have been taught to use
133 - the exit status of underlying "gpg --verify" to signal bad or
134 - untrusted signature they found.
144 +* sg/t3903-missing-fix (2018-08-22) 1 commit
145 + (merged to 'next' on 2018-08-22 at 22f1240ed5)
146 + + t3903-stash: don't try to grep non-existing file
147
148 + Test fixes.
149
137 -* jc/update-index-doc (2018-08-08) 1 commit
138 - (merged to 'next' on 2018-08-15 at 055994ccca)
139 - + update-index: there no longer is `apply --index-info`
150
141 - Doc update.
151 +* sg/t4051-fix (2018-08-22) 1 commit
152 + (merged to 'next' on 2018-08-22 at e1c9adcc14)
153 + + t4051-diff-function-context: read the right file
154 +
155 + Test fixes.
156
157
144 -* jh/partial-clone-doc (2018-08-15) 1 commit
145 - (merged to 'next' on 2018-08-15 at cf09e8be6a)
146 - + partial-clone: render design doc using asciidoc
158 +* sg/t7501-thinkofix (2018-08-22) 1 commit
159 + (merged to 'next' on 2018-08-22 at 69a9b472c7)
160 + + t7501-commit: drop silly command substitution
161
148 - Doc updates.
162 + Test fixes.
163
164
151 -* jk/for-each-object-iteration (2018-08-14) 11 commits
152 - (merged to 'next' on 2018-08-15 at e2558810ff)
153 - + for_each_*_object: move declarations to object-store.h
154 - + cat-file: use a single strbuf for all output
155 - + cat-file: split batch "buf" into two variables
156 - + cat-file: use oidset check-and-insert
157 - + cat-file: support "unordered" output for --batch-all-objects
158 - + cat-file: rename batch_{loose,packed}_object callbacks
159 - + t1006: test cat-file --batch-all-objects with duplicates
160 - + for_each_packed_object: support iterating in pack-order
161 - + for_each_*_object: give more comprehensive docstrings
162 - + for_each_*_object: take flag arguments as enum
163 - + for_each_*_object: store flag definitions in a single location
165 +* sg/test-must-be-empty (2018-08-21) 4 commits
166 + (merged to 'next' on 2018-08-22 at a376680200)
167 + + tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
168 + + tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'
169 + + tests: use 'test_must_be_empty' instead of 'test ! -s'
170 + + tests: use 'test_must_be_empty' instead of '! test -s'
171
165 - The API to iterate over all objects learned to optionally list
166 - objects in the order they appear in packfiles, which helps locality
167 - of access if the caller accesses these objects while as objects are
168 - enumerated.
172 + Test fixes.
173
174
171 -* js/chain-lint-attrfix (2018-08-15) 1 commit
172 - (merged to 'next' on 2018-08-15 at e9ad19a848)
173 - + chainlint: fix for core.autocrlf=true
175 +* sg/test-rebase-editor-fix (2018-08-23) 1 commit
176 + (merged to 'next' on 2018-08-23 at 504538d005)
177 + + t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh'
178
179 Test fix.
180
181
178 -* js/mingw-o-append (2018-08-13) 1 commit
179 - (merged to 'next' on 2018-08-15 at 284527a0fb)
180 - + mingw: enable atomic O_APPEND
182 +* sm/branch-sort-config (2018-08-16) 1 commit
183 + (merged to 'next' on 2018-08-22 at 86d26afa1e)
184 + + branch: support configuring --sort via .gitconfig
185
182 - Among the three codepaths we use O_APPEND to open a file for
183 - appending, one used for writing GIT_TRACE output requires O_APPEND
184 - implementation that behaves sensibly when multiple processes are
185 - writing to the same file. POSIX emulation used in the Windows port
186 - has been updated to improve in this area.
186 + "git branch --list" learned to take the default sort order from the
187 + 'branch.sort' configuration variable, just like "git tag --list"
188 + pays attention to 'tag.sort'.
189
190 +--------------------------------------------------
191 +[New Topics]
192
189 -* js/range-diff (2018-08-13) 21 commits
190 - (merged to 'next' on 2018-08-15 at 8d56067806)
191 - + range-diff: use dim/bold cues to improve dual color mode
192 - + range-diff: make --dual-color the default mode
193 - + range-diff: left-pad patch numbers
194 - + completion: support `git range-diff`
195 - + range-diff: populate the man page
196 - + range-diff --dual-color: skip white-space warnings
197 - + range-diff: offer to dual-color the diffs
198 - + diff: add an internal option to dual-color diffs of diffs
199 - + color: add the meta color GIT_COLOR_REVERSE
200 - + range-diff: use color for the commit pairs
201 - + range-diff: add tests
202 - + range-diff: do not show "function names" in hunk headers
203 - + range-diff: adjust the output of the commit pairs
204 - + range-diff: suppress the diff headers
205 - + range-diff: indent the diffs just like tbdiff
206 - + range-diff: right-trim commit messages
207 - + range-diff: also show the diff between patches
208 - + range-diff: improve the order of the shown commits
209 - + range-diff: first rudimentary implementation
210 - + Introduce `range-diff` to compare iterations of a topic branch
211 - + linear-assignment: a function to solve least-cost assignment problems
212 - (this branch is used by es/format-patch-rangediff and sb/range-diff-colors.)
193 +* ds/format-commit-graph-docs (2018-08-21) 2 commits
194 + - commit-graph.txt: improve formatting for asciidoc
195 + - Docs: Add commit-graph tech docs to Makefile
196
214 - "git tbdiff" that lets us compare individual patches in two
215 - iterations of a topic has been rewritten and made into a built-in
216 - command.
197 + Design docs for the commit-graph machinery is now made into HTML as
198 + well as text.
199
200
219 -* js/rebase-merges-exec-fix (2018-08-09) 2 commits
220 - (merged to 'next' on 2018-08-15 at 9de975d92d)
221 - + rebase --exec: make it work with --rebase-merges
222 - + t3430: demonstrate what -r, --autosquash & --exec should do
201 +* jk/diff-rendered-docs (2018-08-21) 1 commit
202 + (merged to 'next' on 2018-08-22 at dd7a2b71cd)
203 + + SubmittingPatches: mention doc-diff
204
224 - The "--exec" option to "git rebase --rebase-merges" placed the exec
225 - commands at wrong places, which has been corrected.
205 + Dev doc update.
206
207 + Will cook in 'next'.
208
228 -* js/typofixes (2018-08-08) 2 commits
229 - (merged to 'next' on 2018-08-15 at ce3932254a)
230 - + remote-curl: remove spurious period
231 - + git-compat-util.h: fix typo
209
233 - Comment update.
210 +* jk/pack-delta-reuse-with-bitmap (2018-08-21) 6 commits
211 + (merged to 'next' on 2018-08-22 at fc50b59dab)
212 + + pack-objects: reuse on-disk deltas for thin "have" objects
213 + + pack-bitmap: save "have" bitmap from walk
214 + + t/perf: add perf tests for fetches from a bitmapped server
215 + + t/perf: add infrastructure for measuring sizes
216 + + t/perf: factor out percent calculations
217 + + t/perf: factor boilerplate out of test_perf
218
219 + When creating a thin pack, which allows objects to be made into a
220 + delta against another object that is not in the resulting pack but
221 + is known to be present on the receiving end, the code learned to
222 + take advantage of the reachability bitmap; this allows the server
223 + to send a delta against a base beyond the "boundary" commit.
224
236 -* jt/commit-graph-per-object-store (2018-08-13) 1 commit
237 - (merged to 'next' on 2018-08-15 at 5d6db738d8)
238 - + t5318: avoid unnecessary command substitutions
225 + Will cook in 'next'.
226
240 - Test update.
227
228 +* jk/rev-list-stdin-noop-is-ok (2018-08-22) 1 commit
229 + (merged to 'next' on 2018-08-27 at d5916f7bc1)
230 + + rev-list: make empty --stdin not an error
231
243 -* jt/fetch-negotiator-skipping (2018-08-10) 1 commit
244 - (merged to 'next' on 2018-08-15 at 3cf8fa32f5)
245 - + t5552: suppress upload-pack trace output
232 + "git rev-list --stdin </dev/null" used to be an error; it now shows
233 + no output without an error. "git rev-list --stdin --default HEAD"
234 + still falls back to the given default when nothing is given on the
235 + standard input.
236
247 - Test fix.
237 + Will cook in 'next'.
238
239
250 -* jt/repack-promisor-packs (2018-08-09) 2 commits
251 - (merged to 'next' on 2018-08-17 at 6869b53a69)
252 - + repack: repack promisor objects if -a or -A is set
253 - + repack: refactor setup of pack-objects cmd
240 +* js/rebase-in-c-5.5-work-with-rebase-i-in-c (2018-08-29) 2 commits
241 + - builtin rebase: prepare for builtin rebase -i
242 + - Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c
243 + (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.)
244
255 - After a partial clone, repeated fetches from promisor remote would
256 - have accumulated many packfiles marked with .promisor bit without
257 - getting them coalesced into fewer packfiles, hurting performance.
258 - "git repack" now learned to repack them.
245 + "rebase" that has been rewritten learns the new calling convention
246 + used by "rebase -i" that was rewritten in C, tying the loose end
247 + between two GSoC topics that stomped on each other's toes.
248
249
261 -* nd/cherry-pick-quit-fix (2018-08-16) 1 commit
262 - (merged to 'next' on 2018-08-17 at b270179855)
263 - + cherry-pick: fix --quit not deleting CHERRY_PICK_HEAD
250 +* ab/portable (2018-08-27) 6 commits
251 + (merged to 'next' on 2018-08-27 at 37640e66ef)
252 + + tests: fix and add lint for non-portable grep --file
253 + + tests: fix version-specific portability issue in Perl JSON
254 + + tests: use shorter labels in chainlint.sed for AIX sed
255 + + tests: fix comment syntax in chainlint.sed for AIX sed
256 + + tests: fix and add lint for non-portable seq
257 + + tests: fix and add lint for non-portable head -c N
258 + (this branch is used by ab/portable-more.)
259
265 - "git cherry-pick --quit" failed to remove CHERRY_PICK_HEAD even
266 - though we won't be in a cherry-pick session after it returns, which
267 - has been corrected.
260 + Portability fix.
261
262 + Will cook in 'next'.
263
270 -* nd/no-the-index (2018-08-13) 24 commits
271 - (merged to 'next' on 2018-08-15 at 41e53dc53b)
272 - + blame.c: remove implicit dependency on the_index
273 - + apply.c: remove implicit dependency on the_index
274 - + apply.c: make init_apply_state() take a struct repository
275 - + apply.c: pass struct apply_state to more functions
276 - + resolve-undo.c: use the right index instead of the_index
277 - + archive-*.c: use the right repository
278 - + archive.c: avoid access to the_index
279 - + grep: use the right index instead of the_index
280 - + attr: remove index from git_attr_set_direction()
281 - + entry.c: use the right index instead of the_index
282 - + submodule.c: use the right index instead of the_index
283 - + pathspec.c: use the right index instead of the_index
284 - + unpack-trees: avoid the_index in verify_absent()
285 - + unpack-trees: convert clear_ce_flags* to avoid the_index
286 - + unpack-trees: don't shadow global var the_index
287 - + unpack-trees: add a note about path invalidation
288 - + unpack-trees: remove 'extern' on function declaration
289 - + ls-files: correct index argument to get_convert_attr_ascii()
290 - + preload-index.c: use the right index instead of the_index
291 - + dir.c: remove an implicit dependency on the_index in pathspec code
292 - + convert.c: remove an implicit dependency on the_index
293 - + attr: remove an implicit dependency on the_index
294 - + cache-tree: wrap the_index based wrappers with #ifdef
295 - + diff.c: move read_index() code back to the caller
264
297 - The more library-ish parts of the codebase learned to work on the
298 - in-core index-state instance that is passed in by their callers,
299 - instead of always working on the singleton "the_index" instance.
265 +* jk/trailer-fixes (2018-08-23) 8 commits
266 + (merged to 'next' on 2018-08-27 at 93b671b8c6)
267 + + append_signoff: use size_t for string offsets
268 + + sequencer: ignore "---" divider when parsing trailers
269 + + pretty, ref-filter: format %(trailers) with no_divider option
270 + + interpret-trailers: allow suppressing "---" divider
271 + + interpret-trailers: tighten check for "---" patch boundary
272 + + trailer: pass process_trailer_opts to trailer_info_get()
273 + + trailer: use size_t for iterating trailer list
274 + + trailer: use size_t for string offsets
275
276 + "git interpret-trailers" and its underlying machinery had a buggy
277 + code that attempted to ignore patch text after commit log message,
278 + which triggered in various codepaths that will always get the log
279 + message alone and never get such an input.
280
302 -* ng/mergetool-lose-final-prompt (2018-08-13) 1 commit
303 - (merged to 'next' on 2018-08-15 at f8f7ac365b)
304 - + mergetool: don't suggest to continue after last file
281 + Will cook in 'next'.
282
306 - "git mergetool" stopped and gave an extra prompt to continue after
307 - the last path has been handled, which did not make much sense.
283
284 +* tg/rerere-doc-updates (2018-08-29) 2 commits
285 + - rerere: add note about files with existing conflict markers
286 + - rerere: mention caveat about unmatched conflict markers
287 + (this branch uses tg/rerere.)
288
310 -* pw/rebase-i-merge-segv-fix (2018-08-16) 2 commits
311 - (merged to 'next' on 2018-08-17 at c8823e4511)
312 - + rebase -i: fix SIGSEGV when 'merge <branch>' fails
313 - + t3430: add conflicting commit
289 + Clarify a part of technical documentation for rerere.
290
315 - "git rebase -i", when a 'merge <branch>' insn in its todo list
316 - fails, segfaulted, which has been (minimally) corrected.
291 + Will merge to 'next'.
292
293
319 -* pw/rebase-i-squash-number-fix (2018-08-15) 1 commit
320 - (merged to 'next' on 2018-08-17 at ac54dfa51a)
321 - + rebase -i: fix numbering in squash message
294 +* ab/portable-more (2018-08-29) 2 commits
295 + - tests: fix non-portable iconv invocation
296 + - tests: fix non-portable "${var:-"str"}" construct
297 + (this branch uses ab/portable.)
298
323 - When "git rebase -i" is told to squash two or more commits into
324 - one, it labeled the log message for each commit with its number.
325 - It correctly called the first one "1st commit", but the next one
326 - was "commit #1", which was off-by-one. This has been corrected.
299 + Portability fix.
300
301 + Will merge to 'next'.
302
329 -* sb/config-write-fix (2018-08-08) 3 commits
330 - (merged to 'next' on 2018-08-17 at 7d9c7ce81f)
331 - + git-config: document accidental multi-line setting in deprecated syntax
332 - + config: fix case sensitive subsection names on writing
333 - + t1300: document current behavior of setting options
303
335 - Recent update to "git config" broke updating variable in a
336 - subsection, which has been corrected.
304 +* ds/commit-graph-tests (2018-08-29) 1 commit
305 + - commit-graph: define GIT_TEST_COMMIT_GRAPH
306
307 + We can now optionally run tests with commit-graph enabled.
308
339 -* sb/pull-rebase-submodule (2018-08-14) 1 commit
340 - (merged to 'next' on 2018-08-15 at 07c7b55cc9)
341 - + git-submodule.sh: accept verbose flag in cmd_update to be non-quiet
309 + Will merge to 'next'.
310
343 - "git pull --rebase -v" in a repository with a submodule barfed as
344 - an intermediate process did not understand what "-v(erbose)" flag
345 - meant, which has been fixed.
311
312 +* en/directory-renames-nothanks (2018-08-29) 4 commits
313 + - SQUASH???
314 + - am: avoid directory rename detection when calling recursive merge machinery
315 + - merge-recursive: add ability to turn off directory rename detection
316 + - t3401: add another directory rename testcase for rebase and am
317
348 -* sb/submodule-cleanup (2018-08-16) 2 commits
349 - (merged to 'next' on 2018-08-17 at ca9d8aaef4)
350 - + builtin/submodule--helper: remove stray new line
351 - + t7410: update to new style
318 + Recent addition of "directory rename" heuristics to the
319 + merge-recursive backend makes the command susceptible to false
320 + positives and false negatives, but the risk is even more grave when
321 + used in the context of "git am -3", which does not know about any
322 + surrounding unmodified paths while inspecting a patch. The
323 + heuristic is disabled to keep the machinery "more stupid but
324 + predicable".
325
353 - A few preliminary minor clean-ups in the area around submodules.
326 + Will merge to 'next' after squashing the fix in.
327
328
356 -* sg/t5310-empty-input-fix (2018-08-14) 1 commit
357 - (merged to 'next' on 2018-08-15 at c3c03973a0)
358 - + t5310-pack-bitmaps: fix bogus 'pack-objects to file can use bitmap' test
329 +* es/chain-lint-more (2018-08-29) 1 commit
330 + - chainlint: match "quoted" here-doc tags
331 +
332 + The test linter code has learned that the end of here-doc mark
333 + "EOF" can be quoted in a double-quote pair, not just in a
334 + single-quote pair.
335 +
336 + Will merge to 'next'.
337
360 - Test fix.
338
339 +* jk/cocci (2018-08-29) 9 commits
340 + - show_dirstat: simplify same-content check
341 + - read-cache: use oideq() in ce_compare functions
342 + - convert hashmap comparison functions to oideq()
343 + - convert "hashcmp() != 0" to "!hasheq()"
344 + - convert "oidcmp() != 0" to "!oideq()"
345 + - convert "hashcmp() == 0" to hasheq()
346 + - convert "oidcmp() == 0" to oideq()
347 + - introduce hasheq() and oideq()
348 + - coccinelle: use <...> for function exclusion
349
363 -* sk/instaweb-rh-update (2018-08-08) 2 commits
364 - (merged to 'next' on 2018-08-15 at ce5f1115e9)
365 - + git-instaweb: fix apache2 config with apache >= 2.4
366 - + git-instaweb: support Fedora/Red Hat apache module path
350 + spatch transformation to replace boolean uses of !hashcmp() to
351 + newly introduced oideq() is added, and applied, to regain
352 + performance lost due to support of multiple hash algorithms.
353
368 - "git instaweb" has been adjusted to run better with newer Apache on
369 - RedHat based distros.
354 + Will merge to 'next'.
355 +
356 +
357 +* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit
358 + - add -p: coalesce hunks before testing applicability
359 +
360 + Applicability check after a patch is edited in a "git add -i/p"
361 + session has been improved.
362 +
363 + Will merge to 'next'.
364 +
365 +
366 +* rs/mailinfo-format-flowed (2018-08-29) 1 commit
367 + - mailinfo: support format=flowed
368 +
369 + "git mailinfo" used in "git am" learned to make a best-effort
370 + recovery of a patch corrupted by MUA that sends text/plain with
371 + format=flawed option.
372
373 + Will merge to 'next'.
374 +
375 +
376 +* sb/submodule-move-head-with-corruption (2018-08-28) 2 commits
377 + - submodule.c: warn about missing submodule git directories
378 + - t2013: add test for missing but active submodule
379
372 -* wc/make-funnynames-shared-lazy-prereq (2018-08-06) 1 commit
373 - (merged to 'next' on 2018-08-17 at b932a0894b)
374 - + t: factor out FUNNYNAMES as shared lazy prereq
380 + A corner case in switching to a branch that needs to "check out" a
381 + submodule is handled a bit better now.
382 +
383 + Expecting a reroll.
384
376 - A test prerequisite defined by various test scripts with slightly
377 - different semantics has been consolidated into a single copy and
378 - made into a lazily defined one.
385 +
386 +* tg/conflict-marker-size (2018-08-29) 1 commit
387 + - .gitattributes: add conflict-marker-size for relevant files
388 +
389 + Developer aid.
390 +
391 + Will merge to 'next'.
392 +
393 +
394 +* ts/doc-build-manpage-xsl-quietly (2018-08-29) 1 commit
395 + - Documentation/Makefile: make manpage-base-url.xsl generation quieter
396 +
397 + Build tweak.
398 +
399 + Will merge to 'next'.
400
401 --------------------------------------------------
402 [Stalled]
@@ -406,6 +427,7 @@ of the repositories listed at
427
428 * hn/bisect-first-parent (2018-04-21) 1 commit
429 - bisect: create 'bisect_flags' parameter in find_bisection()
430 + (this branch is used by tb/bisect-first-parent.)
431
432 Preliminary code update to allow passing more flags down the
433 bisection codepath in the future.
@@ -474,53 +496,15 @@ of the repositories listed at
496 --------------------------------------------------
497 [Cooking]
498
477 -* ep/worktree-quiet-option (2018-08-17) 1 commit
478 - - worktree: add --quiet option
479 -
480 - "git worktree" command learned "--quiet" option to make it less
481 - verbose.
482 -
483 - Will merge to 'next'.
484 -
485 -
486 -* nd/config-core-checkstat-doc (2018-08-17) 1 commit
487 - - config.txt: clarify core.checkStat
488 -
489 - The meaning of the possible values the "core.checkStat"
490 - configuration variable can take were not adequately documented,
491 - which has been fixed.
492 -
493 - Will merge to 'next'.
494 -
495 -
496 -* sm/branch-sort-config (2018-08-16) 1 commit
497 - - branch: support configuring --sort via .gitconfig
498 -
499 - "git branch --list" learned to take the default sort order from the
500 - 'branch.sort' configuration variable, just like "git tag --list"
501 - pays attention to 'tag.sort'.
502 -
503 - Will merge to 'next'.
504 -
505 -
506 -* ab/unconditional-free-and-null (2018-08-17) 1 commit
507 - - refactor various if (x) FREE_AND_NULL(x) to just FREE_AND_NULL(x)
508 -
509 - Code clean-up.
510 -
511 - Will merge to 'next'.
512 -
513 -
499 * bp/checkout-new-branch-optim (2018-08-16) 1 commit
515 - - checkout: optimize "git checkout -b <new_branch>"
500 + (merged to 'next' on 2018-08-27 at e69bfd115f)
501 + + checkout: optimize "git checkout -b <new_branch>"
502
503 "git checkout -b newbranch [HEAD]" should not have to do as much as
504 checking out a commit different from HEAD. An attempt is made to
505 optimize this special case.
506
521 - So... what is the status of this thing? Is the other "optimize
522 - unpack-trees" effort turning out to be a safer and less hacky way
523 - to achieve similar gain and this no longer is needed?
507 + Will cook in 'next'.
508
509
510 * ao/submodule-wo-gitmodules-checked-out (2018-08-14) 7 commits
@@ -536,37 +520,41 @@ of the repositories listed at
520 HEAD:.gitmodules when the .gitmodules file is missing from the
521 working tree.
522
523 + Expecting a reroll.
524 +
525 I find the design a bit iffy in that our usual "missing in the
526 working tree? let's use the latest blob" fallback is to take it
527 from the index, not from the HEAD.
528
529
530 * bw/submodule-name-to-dir (2018-08-10) 2 commits
545 - - submodule: munge paths to submodule git directories
546 - - submodule: create helper to build paths to submodule gitdirs
531 + (merged to 'next' on 2018-08-22 at c17f83be24)
532 + + submodule: munge paths to submodule git directories
533 + + submodule: create helper to build paths to submodule gitdirs
534
535 In modern repository layout, the real body of a cloned submodule
536 repository is held in .git/modules/ of the superproject, indexed by
537 the submodule name. URLencode the submodule name before computing
538 the name of the directory to make sure they form a flat namespace.
539
553 - Will merge to 'next'.
540 + Will cook in 'next'.
541
542
543 * cc/delta-islands (2018-08-16) 7 commits
557 - - pack-objects: move 'layer' into 'struct packing_data'
558 - - pack-objects: move tree_depth into 'struct packing_data'
559 - - t5320: tests for delta islands
560 - - repack: add delta-islands support
561 - - pack-objects: add delta-islands support
562 - - pack-objects: refactor code into compute_layer_order()
563 - - Add delta-islands.{c,h}
544 + (merged to 'next' on 2018-08-27 at cf3d7bd93f)
545 + + pack-objects: move 'layer' into 'struct packing_data'
546 + + pack-objects: move tree_depth into 'struct packing_data'
547 + + t5320: tests for delta islands
548 + + repack: add delta-islands support
549 + + pack-objects: add delta-islands support
550 + + pack-objects: refactor code into compute_layer_order()
551 + + Add delta-islands.{c,h}
552
553 Lift code from GitHub to restrict delta computation so that an
554 object that exists in one fork is not made into a delta against
555 another object that does not appear in the same forked repository.
556
569 - What's the doneness of this topic?
557 + Will cook in 'next'.
558
559
560 * md/filter-trees (2018-08-16) 6 commits
@@ -580,10 +568,17 @@ of the repositories listed at
568 The "rev-list --filter" feature learned to exclude all trees via
569 "tree:0" filter.
570
571 + What's the status of this one?
572 +
573
574 * ng/status-i-short-for-ignored (2018-08-09) 1 commit
575 - status: -i shorthand for --ignored command line option
576
577 + "git status --ignored" gained a shorthand "git status -i".
578 +
579 + What's the list opinion on this one? It is Meh to me, but
580 + obviously the author cared enough to write a patch, so...
581 +
582
583 * pk/rebase-in-c-2-basic (2018-08-10) 11 commits
584 - builtin rebase: support `git rebase <upstream> <switch-to>`
@@ -597,7 +592,7 @@ of the repositories listed at
592 - builtin rebase: handle the pre-rebase hook (and add --no-verify)
593 - builtin rebase: support `git rebase --onto A...B`
594 - builtin rebase: support --onto
600 - (this branch is used by 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.)
595 + (this branch is used by 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.)
596
597
598 * pk/rebase-in-c-3-acts (2018-08-10) 7 commits
@@ -608,7 +603,7 @@ of the repositories listed at
603 - builtin rebase: support --abort
604 - builtin rebase: support --skip
605 - builtin rebase: support --continue
611 - (this branch is used by 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.)
606 + (this branch is used by 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.)
607
608
609 * pk/rebase-in-c-4-opts (2018-08-10) 18 commits
@@ -630,7 +625,7 @@ of the repositories listed at
625 - builtin rebase: support --rerere-autoupdate
626 - builtin rebase: support --signoff
627 - builtin rebase: allow selecting the rebase "backend"
633 - (this branch is used by 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.)
628 + (this branch is used by 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.)
629
630
631 * pk/rebase-in-c-5-test (2018-08-10) 6 commits
@@ -640,16 +635,12 @@ of the repositories listed at
635 - builtin rebase: fast-forward to onto if it is a proper descendant
636 - builtin rebase: optionally pass custom reflogs to reset_head()
637 - builtin rebase: optionally auto-detect the upstream
643 - (this branch is used by 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.)
638 + (this branch is used by 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.)
639
640
646 -* pk/rebase-in-c-6-final (2018-08-10) 1 commit
641 +* pk/rebase-in-c-6-final (2018-08-29) 1 commit
642 - rebase: default to using the builtin rebase
648 - (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.)
649 -
650 - With "rebase -i" machinery being rewritten to C, with a different
651 - interface between "rebase" proper and its backends, this and the
652 - other topics need a bit more work to play with each other better.
643 + (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.)
644
645
646 * ps/stash-in-c (2018-08-08) 26 commits
@@ -682,7 +673,8 @@ of the repositories listed at
673
674
675 * nd/clone-case-smashing-warning (2018-08-17) 1 commit
685 - - clone: report duplicate entries on case-insensitive filesystems
676 + (merged to 'next' on 2018-08-22 at eedae40a8d)
677 + + clone: report duplicate entries on case-insensitive filesystems
678
679 Running "git clone" against a project that contain two files with
680 pathnames that differ only in cases on a case insensitive
@@ -690,17 +682,20 @@ of the repositories listed at
682 underlying filesystem is incapable of holding both at the same
683 time. An attempt is made to detect such a case and warn.
684
693 - Will merge to 'next'.
685 + Will cook in 'next'.
686
687
696 -* nd/unpack-trees-with-cache-tree (2018-08-18) 7 commits
697 - - cache-tree: verify valid cache-tree in the test suite
698 - - unpack-trees: add missing cache invalidation
699 - - unpack-trees: reuse (still valid) cache-tree from src_index
700 - - unpack-trees: reduce malloc in cache-tree walk
701 - - unpack-trees: optimize walking same trees with cache-tree
702 - - unpack-trees: add performance tracing
703 - - trace.h: support nested performance tracing
688 +* nd/unpack-trees-with-cache-tree (2018-08-27) 8 commits
689 + (merged to 'next' on 2018-08-27 at b1d841d034)
690 + + Document update for nd/unpack-trees-with-cache-tree
691 + (merged to 'next' on 2018-08-22 at 138b902673)
692 + + cache-tree: verify valid cache-tree in the test suite
693 + + unpack-trees: add missing cache invalidation
694 + + unpack-trees: reuse (still valid) cache-tree from src_index
695 + + unpack-trees: reduce malloc in cache-tree walk
696 + + unpack-trees: optimize walking same trees with cache-tree
697 + + unpack-trees: add performance tracing
698 + + trace.h: support nested performance tracing
699
700 The unpack_trees() API used in checking out a branch and merging
701 walks one or more trees along with the index. When the cache-tree
@@ -710,28 +705,37 @@ of the repositories listed at
705 open tree objects recursively and listing their entries, the walk
706 can be optimized, which is done in this topic.
707
713 - Will merge to and cook in 'next'.
708 + Will cook in 'next'.
709
710
716 -* sb/range-diff-colors (2018-08-14) 8 commits
717 - - diff.c: rewrite emit_line_0 more understandably
718 - - diff.c: omit check for line prefix in emit_line_0
719 - - diff: use emit_line_0 once per line
720 - - diff.c: add set_sign to emit_line_0
721 - - diff.c: reorder arguments for emit_line_ws_markup
722 - - diff.c: simplify caller of emit_line_0
723 - - t3206: add color test for range-diff --dual-color
724 - - test_decode_color: understand FAINT and ITALIC
711 +* sb/range-diff-colors (2018-08-20) 11 commits
712 + (merged to 'next' on 2018-08-22 at eb7ed4fca3)
713 + + range-diff: indent special lines as context
714 + + range-diff: make use of different output indicators
715 + + diff.c: add --output-indicator-{new, old, context}
716 + + diff.c: rewrite emit_line_0 more understandably
717 + + diff.c: omit check for line prefix in emit_line_0
718 + + diff: use emit_line_0 once per line
719 + + diff.c: add set_sign to emit_line_0
720 + + diff.c: reorder arguments for emit_line_ws_markup
721 + + diff.c: simplify caller of emit_line_0
722 + + t3206: add color test for range-diff --dual-color
723 + + test_decode_color: understand FAINT and ITALIC
724
725 The color output support for recently introduced "range-diff"
726 command got tweaked a bit.
727
728 + Will cook in 'next'.
729 +
730
731 * sg/t1404-update-ref-test-timeout (2018-08-01) 1 commit
731 - - t1404: increase core.packedRefsTimeout to avoid occasional test failure
732 + (merged to 'next' on 2018-08-22 at f3cd37b5ea)
733 + + t1404: increase core.packedRefsTimeout to avoid occasional test failure
734
735 An attempt to unflake a test a bit.
736
737 + Will cook in 'next'.
738 +
739
740 * pw/rebase-i-author-script-fix (2018-08-07) 2 commits
741 - sequencer: fix quoting in write_author_script
@@ -741,9 +745,7 @@ of the repositories listed at
745 author-script, with a matching broken reading code. These are
746 being fixed.
747
744 - Undecided.
745 - Is it the list consensus to favor this "with extra code, read the
746 - script written by bad writer" approach?
748 + Will merge to 'next'.
749
750
751 * pw/add-p-select (2018-07-26) 4 commits
@@ -762,16 +764,15 @@ of the repositories listed at
764 end-user complaints, but let's see.
765
766
765 -* ds/commit-graph-with-grafts (2018-07-19) 8 commits
766 - (merged to 'next' on 2018-08-02 at 0ee624e329)
767 - + commit-graph: close_commit_graph before shallow walk
768 - + commit-graph: not compatible with uninitialized repo
769 - + commit-graph: not compatible with grafts
770 - + commit-graph: not compatible with replace objects
771 - + test-repository: properly init repo
772 - + commit-graph: update design document
773 - + refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback
774 - + refs.c: migrate internal ref iteration to pass thru repository argument
767 +* ds/commit-graph-with-grafts (2018-08-21) 8 commits
768 + - commit-graph: close_commit_graph before shallow walk
769 + - commit-graph: not compatible with uninitialized repo
770 + - commit-graph: not compatible with grafts
771 + - commit-graph: not compatible with replace objects
772 + - test-repository: properly init repo
773 + - commit-graph: update design document
774 + - refs.c: upgrade for_each_replace_ref to be a each_repo_ref_fn callback
775 + - refs.c: migrate internal ref iteration to pass thru repository argument
776
777 The recently introduced commit-graph auxiliary data is incompatible
778 with mechanisms such as replace & grafts that "breaks" immutable
@@ -779,35 +780,37 @@ of the repositories listed at
780 based on its use (and updating existing commit-graph) when these
781 incompatible features are in use in the repository.
782
782 - Eject and replace with another reroll when it comes.
783 - cf. <85c6eb4c-a083-4fb7-4860-b01a8ce9fa4f@gmail.com>
784 -
785 -
786 -* ds/reachable (2018-07-20) 18 commits
787 - - commit-reach: use can_all_from_reach
788 - - commit-reach: make can_all_from_reach... linear
789 - - commit-reach: replace ref_newer logic
790 - - test-reach: test commit_contains
791 - - test-reach: test can_all_from_reach_with_flags
792 - - test-reach: test reduce_heads
793 - - test-reach: test get_merge_bases_many
794 - - test-reach: test is_descendant_of
795 - - test-reach: test in_merge_bases
796 - - test-reach: create new test tool for ref_newer
797 - - commit-reach: move can_all_from_reach_with_flags
798 - - upload-pack: generalize commit date cutoff
799 - - upload-pack: refactor ok_to_give_up()
800 - - upload-pack: make reachable() more generic
801 - - commit-reach: move commit_contains from ref-filter
802 - - commit-reach: move ref_newer from remote.c
803 - - commit.h: remove method declarations
804 - - commit-reach: move walk methods from commit.c
783 + Replaced with a newer version.
784 +
785 +
786 +* ds/reachable (2018-08-28) 19 commits
787 + (merged to 'next' on 2018-08-28 at b1634b371d)
788 + + commit-reach: correct accidental #include of C file
789 + (merged to 'next' on 2018-08-22 at 17f3275afb)
790 + + commit-reach: use can_all_from_reach
791 + + commit-reach: make can_all_from_reach... linear
792 + + commit-reach: replace ref_newer logic
793 + + test-reach: test commit_contains
794 + + test-reach: test can_all_from_reach_with_flags
795 + + test-reach: test reduce_heads
796 + + test-reach: test get_merge_bases_many
797 + + test-reach: test is_descendant_of
798 + + test-reach: test in_merge_bases
799 + + test-reach: create new test tool for ref_newer
800 + + commit-reach: move can_all_from_reach_with_flags
801 + + upload-pack: generalize commit date cutoff
802 + + upload-pack: refactor ok_to_give_up()
803 + + upload-pack: make reachable() more generic
804 + + commit-reach: move commit_contains from ref-filter
805 + + commit-reach: move ref_newer from remote.c
806 + + commit.h: remove method declarations
807 + + commit-reach: move walk methods from commit.c
808
809 The code for computing history reachability has been shuffled,
810 obtained a bunch of new tests to cover them, and then being
811 improved.
812
810 - Will merge to and cook in 'next'.
813 + Will cook in 'next'.
814
815
816 * es/format-patch-interdiff (2018-07-23) 6 commits
@@ -823,7 +826,7 @@ of the repositories listed at
826 the difference between this version and the previous atttempt in
827 the cover letter (or after the tree-dashes as a comment).
828
826 - Stuck in review?
829 + What's the doneness of this one?
830 cf. <CAPig+cSuYUYSPTuKx08wcmQM-G12_-W2T4BS07fA=6grM1b8Gw@mail.gmail.com>
831
832
@@ -844,21 +847,11 @@ of the repositories listed at
847 the difference between this version and the previous atttempt in
848 the cover letter (or after the tree-dashes as a comment).
849
847 - Need to wait for the prereq topics to solidify a bit more.
850 + What's the doneness of this one?
851
852
850 -* nd/pack-deltify-regression-fix (2018-07-23) 1 commit
851 - (merged to 'next' on 2018-08-02 at f3b2bf0fef)
852 - + pack-objects: fix performance issues on packing large deltas
853 -
854 - In a recent update in 2.18 era, "git pack-objects" started
855 - producing a larger than necessary packfiles by missing
856 - opportunities to use large deltas.
857 -
858 - Will merge to 'master'.
859 -
860 -
861 -* jh/structured-logging (2018-07-25) 25 commits
853 +* jh/structured-logging (2018-08-28) 26 commits
854 + - SQUASH??? spatch fix
855 - structured-logging: add config data facility
856 - structured-logging: t0420 tests for interacitve child_summary
857 - structured-logging: t0420 tests for child process detail events
@@ -885,7 +878,8 @@ of the repositories listed at
878 - structured-logging: add STRUCTURED_LOGGING=1 to Makefile
879 - structured-logging: design document
880
888 - Will merge to 'next'.
881 + Expecting a reroll.
882 + cf. <4bc19d36-1242-9e83-a9ed-ed58a681b499@jeffhostetler.com>
883
884
885 * jn/gc-auto (2018-07-17) 3 commits
@@ -900,7 +894,7 @@ of the repositories listed at
894 point running gc to improve the situation); we used to exit with
895 failure in such a case.
896
903 - Stuck in review?
897 + What's the donness of this one?
898 cf. <20180717201348.GD26218@sigill.intra.peff.net>
899
900
@@ -916,7 +910,7 @@ of the repositories listed at
910
911 "git submodule update" is getting rewritten piece-by-piece into C.
912
919 - Will merge to 'master'.
913 + Will cook in 'next'.
914
915
916 * tg/rerere (2018-08-06) 11 commits
@@ -932,14 +926,15 @@ of the repositories listed at
926 + rerere: wrap paths in output in sq
927 + rerere: lowercase error messages
928 + rerere: unify error messages when read_cache fails
929 + (this branch is used by tg/rerere-doc-updates.)
930
931 Fixes to "git rerere" corner cases, especially when conflict
932 markers cannot be parsed in the file.
933
939 - Will merge to 'master'.
934 + Will cook in 'next'.
935
936
942 -* ag/rebase-i-in-c (2018-08-10) 20 commits
937 +* ag/rebase-i-in-c (2018-08-29) 20 commits
938 - rebase -i: move rebase--helper modes to rebase--interactive
939 - rebase -i: remove git-rebase--interactive.sh
940 - rebase--interactive2: rewrite the submodes of interactive rebase in C
@@ -960,13 +955,10 @@ of the repositories listed at
955 - editor: add a function to launch the sequence editor
956 - rebase -i: rewrite append_todo_help() in C
957 - sequencer: make three functions and an enum from sequencer.c public
958 + (this branch is used by js/rebase-in-c-5.5-work-with-rebase-i-in-c and pk/rebase-in-c-6-final.)
959
960 Rewrite of the remaining "rebase -i" machinery in C.
961
966 - With "rebase -i" machinery being rewritten to C, with a different
967 - interface between "rebase" proper and its backends, this and the
968 - other topics need a bit more work to play with each other better.
969 -
962
963 * lt/date-human (2018-07-09) 1 commit
964 - Add 'human' date format
@@ -982,7 +974,7 @@ of the repositories listed at
974 - builtin/rebase: support running "git rebase <upstream>"
975 - rebase: refactor common shell functions into their own file
976 - rebase: start implementing it as a builtin
985 - (this branch is used by pk/rebase-in-c-2-basic, 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.)
977 + (this branch is used by js/rebase-in-c-5.5-work-with-rebase-i-in-c, pk/rebase-in-c-2-basic, 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.)
978
979 Rewrite of the "rebase" machinery in C.
980
@@ -996,7 +988,18 @@ of the repositories listed at
988 Will cook in 'next'.
989
990
999 -* ds/multi-pack-index (2018-07-20) 23 commits
991 +* ds/multi-pack-index (2018-08-20) 33 commits
992 + (merged to 'next' on 2018-08-21 at d15e8cadd4)
993 + + pack-objects: consider packs in multi-pack-index
994 + + midx: test a few commands that use get_all_packs
995 + + treewide: use get_all_packs
996 + + packfile: add all_packs list
997 + + midx: fix bug that skips midx with alternates
998 + + midx: stop reporting garbage
999 + + midx: mark bad packed objects
1000 + + multi-pack-index: store local property
1001 + + multi-pack-index: provide more helpful usage info
1002 + + Sync 'ds/multi-pack-index' to v2.19.0-rc0
1003 (merged to 'next' on 2018-08-08 at 1a56c52967)
1004 + midx: clear midx on repack
1005 + packfile: skip loading index if in multi-pack-index