de4ebe0460 · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Aug 2020, #04; Tue, 18)

4 -X-master-at: 2befe97201e1f3175cce557866c5822793624b5a

5 -X-next-at: 76ed4a4daf6aec5583ad1c21b86f032a08bf353f

3 +Subject: What's cooking in git.git (Aug 2020, #05; Fri, 21)

4 +X-master-at: 675a4aaf3b226c0089108221b96559e0baae5de9

5 +X-next-at: ade71fd49b68a1c786ec40be7b66ba922c60ee98

6

7 -What's cooking in git.git (Aug 2020, #04; Tue, 18)

7 +What's cooking in git.git (Aug 2020, #05; Fri, 21)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with '-' are

@@ -20,152 +20,92 @@ repositories listed at

20 --------------------------------------------------

21 [Graduated to 'master']

22

23 -* al/bisect-first-parent (2020-08-07) 5 commits

24 - (merged to 'next' on 2020-08-11 at b232f7ca17)

25 - + bisect: combine args passed to find_bisection()

26 - + bisect: introduce first-parent flag

27 - + cmd_bisect__helper: defer parsing no-checkout flag

28 - + rev-list: allow bisect and first-parent flags

29 - + t6030: modernize "git bisect run" tests

30 -

31 - "git bisect" learns the "--first-parent" option to find the first

32 - breakage along the first-parent chain.

33 -

34 -

35 -* dd/send-email-config (2020-07-23) 1 commit

36 - (merged to 'next' on 2020-08-11 at aaf9f3a301)

37 - + git-send-email: die if sendmail.* config is set

38 -

39 - Stop when "sendmail.*" configuration variables are defined, which

40 - could be a mistaken attempt to define "sendemail.*" variables.

41 -

42 -

43 -* es/test-cmp-typocatcher (2020-08-09) 1 commit

44 - (merged to 'next' on 2020-08-11 at ee5557b170)

45 - + test_cmp: diagnose incorrect arguments

46 -

47 - Test framework update.

48 -

49 -

50 -* hn/reftable-prep-part-2 (2020-07-27) 3 commits

51 - (merged to 'next' on 2020-08-11 at 43ac0bc60a)

52 - + Make HEAD a PSEUDOREF rather than PER_WORKTREE.

53 - + Modify pseudo refs through ref backend storage

54 - + t1400: use git rev-parse for testing PSEUDOREF existence

55 -

56 - Further preliminary change to refs API.

57 -

58 -

59 -* jc/noop-with-static-inline (2020-08-06) 1 commit

60 - (merged to 'next' on 2020-08-11 at 8a63ff648e)

61 - + compat-util: type-check parameters of no-op replacement functions

62 -

63 - A no-op replacement function implemented as a C preprocessor macro

64 - does not perform as good a job as one implemented as a "static

65 - inline" function in catching errors in parameters; replace the

66 - former with the latter in <git-compat-util.h> header.

67 -

68 -

69 -* jk/log-fp-implies-m (2020-07-29) 7 commits

70 - (merged to 'next' on 2020-08-03 at 39fefa6b82)

71 - + doc/git-log: clarify handling of merge commit diffs

72 - + doc/git-log: move "-t" into diff-options list

73 - + doc/git-log: drop "-r" diff option

74 - + doc/git-log: move "Diff Formatting" from rev-list-options

75 - + log: enable "-m" automatically with "--first-parent"

76 - + revision: add "--no-diff-merges" option to counteract "-m"

77 - + log: drop "--cc implies -m" logic

78 - (this branch is used by so/log-diff-merges-opt.)

79 -

80 - Originally merged to 'next' on 2020-08-01

23 +* ak/sequencer-fix-find-uniq-abbrev (2020-08-13) 1 commit

24 + (merged to 'next' on 2020-08-17 at 6ce0f1d111)

25 + + rebase -i: fix possibly wrong onto hash in todo

26

82 - "git log --first-parent -p" showed patches only for single-parent

83 - commits on the first-parent chain; the "--first-parent" option has

84 - been made to imply "-m". Use "--no-diff-merges" to restore the

85 - previous behaviour to omit patches for merge commits.

27 + Ring buffer with size 4 used for bin-hex translation resulted in a

28 + wrong object name in the sequencer's todo output, which has been

29 + corrected.

30

87 - Will merge to 'master' together with 'so/log-diff-merges-opt'

31

32 +* bc/sha-256-doc-updates (2020-08-13) 2 commits

33 + (merged to 'next' on 2020-08-17 at 7154a0ce3c)

34 + + docs: fix step in transition plan

35 + + docs: document SHA-256 pack and indices

36

90 -* jk/sideband-error-l10n (2020-08-07) 1 commit

91 - (merged to 'next' on 2020-08-11 at 27dbe05a65)

92 - + sideband: mark "remote error:" prefix for translation

37 + Further update of docs to adjust to the recent SHA-256 work.

38

94 - Mark error message for i18n.

39

40 +* ds/sha256-leftover-bits (2020-08-17) 3 commits

41 + (merged to 'next' on 2020-08-17 at a8e6f9f3f4)

42 + + multi-pack-index: use hash version byte

43 + + commit-graph: use the "hash version" byte

44 + + t/README: document GIT_TEST_DEFAULT_HASH

45

97 -* ma/stop-progress-null-fix (2020-08-10) 1 commit

98 - (merged to 'next' on 2020-08-13 at 8bdec5209f)

99 - + progress: don't dereference before checking for NULL

46 + midx and commit-graph files now use the byte defined in their file

47 + format specification for identifying the hash function used for

48 + object names.

49

101 - NULL dereference fix.

50

51 +* en/merge-tests (2020-08-10) 11 commits

52 + (merged to 'next' on 2020-08-13 at eab952350b)

53 + + t6425: be more flexible with rename/delete conflict messages

54 + + t642[23]: be more flexible for add/add conflicts involving pair renames

55 + + t6422, t6426: be more flexible for add/add conflicts involving renames

56 + + t6423: add an explanation about why one of the tests does not pass

57 + + t6416, t6423: clarify some comments and fix some typos

58 + + t6422: fix multiple errors with the mod6 test expectations

59 + + t6423: fix test setup for a couple tests

60 + + t6416, t6422: fix incorrect untracked file count

61 + + t6422: fix bad check against missing file

62 + + t6418: tighten delete/normalize conflict testcase

63 + + Collect merge-related tests to t64xx

64

104 -* pd/mergetool-nvimdiff (2020-07-29) 2 commits

105 - (merged to 'next' on 2020-08-11 at 947ce686d0)

106 - + mergetools: add support for nvimdiff (neovim) family

107 - + mergetool--lib: improve support for vimdiff-style tool variants

65 + Updates to "git merge" tests, in preparation for a new merge

66 + strategy backend.

67

109 - The existing backends for "git mergetool" based on variants of vim

110 - have been refactored and then support for "nvim" has been added.

68

69 +* en/sequencer-merge-labels (2020-08-14) 1 commit

70 + (merged to 'next' on 2020-08-17 at 2010e329ed)

71 + + sequencer: avoid garbled merge machinery messages due to commit labels

72

113 -* ps/ref-transaction-hook (2020-08-11) 2 commits

114 - (merged to 'next' on 2020-08-11 at 311c045810)

115 - + t1416: avoid hard-coded sha1 ids

116 - (merged to 'next' on 2020-08-10 at d8ad7cc8f6)

117 - + refs: fix interleaving hook calls with reference-transaction hook

73 + The commit labels used to explain each side of conflicted hunks

74 + placed by the sequencer machinery have been made more readable by

75 + humans.

76

119 - The logic to find the ref transaction hook script attempted to

120 - cache the path to the found hook without realizing that it needed

121 - to keep a copied value, as the API it used returned a transitory

122 - buffer space. This has been corrected.

123 - to be followed by a removal of the caching feature, which does not

124 - seem to help even as a negative cache.

77

78 +* jb/commit-graph-doc-fix (2020-08-13) 1 commit

79 + (merged to 'next' on 2020-08-17 at d83ee98955)

80 + + docs: commit-graph: fix some whitespace in the diagram

81

127 -* rp/apply-cached-with-i-t-a (2020-08-09) 3 commits

128 - (merged to 'next' on 2020-08-11 at c28eaa6a0e)

129 - + t4140: test apply with i-t-a paths

130 - + apply: make i-t-a entries never match worktree

131 - + apply: allow "new file" patches on i-t-a entries

82 + Docfix.

83

133 - Recent versions of "git diff-files" shows a diff between the index

134 - and the working tree for "intent-to-add" paths as a "new file"

135 - patch; "git apply --cached" should be able to take "git diff-files"

136 - and should act as an equivalent to "git add" for the path, but the

137 - command failed to do so for such a path.

84

85 +* jc/object-names-are-not-sha-1 (2020-08-14) 1 commit

86 + (merged to 'next' on 2020-08-17 at 400fe9e831)

87 + + messages: avoid SHA-1 in end-user facing messages

88

140 -* so/log-diff-merges-opt (2020-08-11) 3 commits

141 - (merged to 'next' on 2020-08-11 at 99e070bdca)

142 - + t/t4013: add test for --diff-merges=off

143 - + doc/git-log: describe --diff-merges=off

144 - + revision: change "--diff-merges" option to require parameter

145 - (this branch uses jk/log-fp-implies-m.)

89 + A few end-user facing messages have been updated to be

90 + hash-algorithm agnostic.

91

147 - Earlier, to countermand the implicit "-m" option when the

148 - "--first-parent" option is used with "git log", we added the

149 - "--[no-]diff-merges" option in the jk/log-fp-implies-m topic. To

150 - leave the door open to allow the "--diff-merges" option to take

151 - values that instructs how patches for merge commits should be

152 - computed (e.g. "cc"? "-p against first parent?"), redefine

153 - "--diff-merges" to take non-optional value, and implement "off"

154 - that means the same thing as "--no-diff-merges".

92

156 - Will merge to 'master' together with 'jk/lo-implies-m'.

93 +* jh/mingw-unlink (2020-08-17) 1 commit

94 + (merged to 'next' on 2020-08-17 at fb53a3d1a1)

95 + + mingw: improve performance of mingw_unlink()

96

158 ---------------------------------------------------

159 -[New Topics]

97 + "unlink" emulation on MinGW has been optimized.

98

161 -* bc/sha-256-doc-updates (2020-08-13) 2 commits

162 - (merged to 'next' on 2020-08-17 at 7154a0ce3c)

163 - + docs: fix step in transition plan

164 - + docs: document SHA-256 pack and indices

99

166 - Further update of docs to adjust to the recent SHA-256 work.

100 +* jk/blame-coalesce-fix (2020-08-13) 3 commits

101 + (merged to 'next' on 2020-08-17 at 122c701ec7)

102 + + blame: only coalesce lines that are adjacent in result

103 + + t8003: factor setup out of coalesce test

104 + + t8003: check output of coalesced blame

105

168 - Will merge to 'master'.

106 + When given more than one target line ranges, "git blame -La,b

107 + -Lc,d" was over-eager to coalesce groups of original lines and

108 + showed incorrect results, which has been corrected.

109

110

111 * ma/sha-256-docs (2020-08-17) 4 commits

@@ -177,175 +117,133 @@ repositories listed at

117

118 Further update of docs to adjust to the recent SHA-256 work.

119

180 - Will merge to 'master'.

181 -

182 -

183 -* dd/diff-customize-index-line-abbrev (2020-08-13) 2 commits

184 - - diff: index-line: respect --abbrev in object's name

185 - - revision: differentiate if --no-abbrev asked explicitly

186 -

187 - The output from the "diff" family of the commands had abbreviated

188 - object names of blobs involved in the patch, but its length was not

189 - affected by the --abbrev option. Now it is.

190 -

191 - The first patch is unneeded.

120

121 +* pb/set-url-docfix (2020-08-13) 1 commit

122 + (merged to 'next' on 2020-08-17 at 19b56c6ebb)

123 + + fetch, pull doc: correct description of '--set-upstream'

124

194 -* ds/sha256-leftover-bits (2020-08-17) 3 commits

195 - (merged to 'next' on 2020-08-17 at a8e6f9f3f4)

196 - + multi-pack-index: use hash version byte

197 - + commit-graph: use the "hash version" byte

198 - + t/README: document GIT_TEST_DEFAULT_HASH

125 + Doc fix.

126

200 - midx and commit-graph files now use the byte defined in their file

201 - format specification for identifying the hash function used for

202 - object names.

127

204 - Will merge to 'master'.

128 +* pb/userdiff-fortran-update (2020-08-13) 2 commits

129 + (merged to 'next' on 2020-08-17 at 534af3f35a)

130 + + userdiff: improve Fortran xfuncname regex

131 + + userdiff: add tests for Fortran xfuncname regex

132

133 + The regexp to identify the function boundary for FORTRAN programs

134 + has been updated.

135

207 -* hn/refs-fetch-head-is-special (2020-08-17) 4 commits

208 - - refs: read FETCH_HEAD generically

209 - - refs: move gitdir into base ref_store

210 - - refs: fix comment about submodule ref_stores

211 - - Split off reading loose ref data in separate function

212 - (this branch is used by hn/refs-pseudorefs.)

136

214 - The FETCH_HEAD is now always read from the filesystem regardless of

215 - the ref backend in use, as its format is much richer than the

216 - normal refs, and written directly by "git fetch" as a plain file..

137 +* rp/ita-diff-modefix (2020-08-09) 1 commit

138 + (merged to 'next' on 2020-08-17 at c03a9cfb6e)

139 + + diff-lib: use worktree mode in diffs from i-t-a entries

140

141 + "git diff [<tree-ish>] $path" for a $path that is marked with i-t-a

142 + bit was not showing the mode bits from the working tree.

143

219 -* hv/ref-filter-misc (2020-08-17) 9 commits

220 - - ref-filter: add `sanitize` option for 'subject' atom

221 - - format-support: move `format_sanitized_subject()` from pretty

222 - - pretty: refactor `format_sanitized_subject()`

223 - - ref-filter: add `short` modifier to 'parent' atom

224 - - ref-filter: add `short` modifier to 'tree' atom

225 - - ref-filter: rename `objectname` related functions and fields

226 - - ref-filter: modify error messages in `grab_objectname()`

227 - - ref-filter: refactor `grab_objectname()`

228 - - ref-filter: support different email formats

144

230 - The "--format=" option to the "for-each-ref" command and friends

231 - learned a few more tricks, e.g. the ":short" suffix that applies to

232 - "objectname" now also can be used for "parent", "tree", etc.

145 +* rs/preserve-merges-unused-code-removal (2020-08-12) 1 commit

146 + (merged to 'next' on 2020-08-17 at b96393455c)

147 + + rebase: remove unused function reschedule_last_action

148

149 + Code clean-up.

150

235 -* jc/object-names-are-not-sha-1 (2020-08-14) 1 commit

236 - (merged to 'next' on 2020-08-17 at 400fe9e831)

237 - + messages: avoid SHA-1 in end-user facing messages

151

239 - A few end-user facing messages have been update to be

240 - hash-algorithm agnostic.

152 +* rs/upload-pack-sigchain-fix (2020-08-11) 1 commit

153 + (merged to 'next' on 2020-08-17 at 997473f309)

154 + + upload-pack: remove superfluous sigchain_pop() call

155

242 - Will merge to 'master'.

156 + Code clean-up.

157

158 +--------------------------------------------------

159 +[New Topics]

160

245 -* jh/mingw-unlink (2020-08-17) 1 commit

246 - (merged to 'next' on 2020-08-17 at fb53a3d1a1)

247 - + mingw: improve performance of mingw_unlink()

161 +* en/dir-clear (2020-08-18) 2 commits

162 + (merged to 'next' on 2020-08-19 at 18c5b69293)

163 + + dir: fix problematic API to avoid memory leaks

164 + + dir: make clear_directory() free all relevant memory

165

249 - "unlink" emulation on MinGW has been optimized.

166 + Leakfix with code clean-up.

167

168 Will merge to 'master'.

169

170

254 -* jk/leakfix (2020-08-17) 7 commits

255 - - submodule--helper: fix leak of core.worktree value

256 - - config: fix leak in git_config_get_expiry_in_days()

257 - - config: drop git_config_get_string_const()

258 - - config: fix leaks from git_config_get_string_const()

259 - - checkout: fix leak of non-existent branch names

260 - - submodule--helper: use strbuf_release() to free strbufs

261 - - clear_pattern_list(): clear embedded hashmaps

171 +* hn/refs-pseudorefs (2020-08-21) 4 commits

172 + - sequencer: treat REVERT_HEAD as a pseudo ref

173 + - builtin/commit: suggest update-ref for pseudoref removal

174 + - sequencer: treat CHERRY_PICK_HEAD as a pseudo ref

175 + - refs: make refs_ref_exists public

176 + (this branch uses hn/refs-fetch-head-is-special.)

177

263 - Code clean-up.

178 + Accesses to two pseudorefs have been updated to properly use ref

179 + API.

180

181 Will merge to 'next'.

182

183

268 -* jk/refspecs-negative (2020-08-17) 3 commits

269 - - refspec: add support for negative refspecs

270 - - refspec: make sure stack refspec_item variables are zeroed

271 - - refspec: fix documentation referring to refspec_item

184 +* rs/patch-id-with-incomplete-line (2020-08-18) 1 commit

185 + (merged to 'next' on 2020-08-19 at 72961d48d0)

186 + + patch-id: ignore newline at end of file in diff_flush_patch_id()

187

273 - "negative refspecs"

274 -

275 -

276 -* jt/fetch-pack-loosen-validation-with-packfile-uri (2020-08-14) 1 commit

277 - - fetch-pack: make packfile URIs work with transfer.fsckobjects

188 + The patch-id computation did not ignore the "incomplete last line"

189 + marker like whitespaces.

190

279 - Bugfix for "git fetch" when the packfile URI capability is in use.

191 + Will merge to 'master'.

192

281 - Need to pick up a reroll.

193

194 +* rz/complete-more-options (2020-08-19) 2 commits

195 + (merged to 'next' on 2020-08-21 at ba8f4c8cb1)

196 + + completion: add GIT_COMPLETION_SHOW_ALL env var

197 + + parse-options: add --git-completion-helper-all

198

284 -* mr/diff-hide-stat-wo-textual-change (2020-08-17) 1 commit

285 - - diff: teach --stat to ignore uninteresting modifications

286 -

287 - Expecting a reroll.

199 + Command line completion (in contrib/) usually omits redundant,

200 + deprecated and/or dangerous options from its output; it learned to

201 + optionally include all of them.

202

203 + Will merge to 'master'.

204

290 -* pw/add-p-allowed-options-fix (2020-08-17) 2 commits

291 - - add -p: fix checking of user input

292 - - add -p: use ALLOC_GROW_BY instead of ALLOW_GROW

205

294 - "git add -p" update.

206 +* jt/promisor-pack-fix (2020-08-20) 1 commit

207 + - fetch-pack: in partial clone, pass --promisor

208

296 - Doubts?

297 - cf. <pull.702.git.1597670589.gitgitgadget@gmail.com>

209 + Updates into a lazy/partial clone with a submodule did not work

210 + well with transfer.fsckobjects set.

211

212

300 -* dl/subtree-docs (2020-08-18) 2 commits

301 - - contrib/subtree: document 'push' does not take '--squash'

302 - - contrib/subtree: fix "unsure" for --message in the document

213 +* hv/ref-filter-trailers-atom-parsing-fix (2020-08-21) 2 commits

214 + - ref-filter: 'contents:trailers' show error if `:` is missing

215 + - t6300: unify %(trailers) and %(contents:trailers) tests

216

304 - Doc updates for subtree (in contrib/)

217 + The parser for "git for-each-ref --format=..." was too loose when

218 + parsing the "%(trailers...)" atom, and forgot that "trailers" and

219 + "trailers:<modifers>" are the only two allowed forms, which has

220 + been corrected.

221

222 Will merge to 'next'.

223

224

309 -* en/mem-pool (2020-08-18) 3 commits

310 - - mem-pool: use consistent pool variable name

311 - - mem-pool: use more standard initialization and finalization

312 - - mem-pool: add convenience functions for strdup and strndup

225 +* jc/ident-whose-ident (2020-08-21) 1 commit

226 + - ident: say whose identity is missing when giving user.name hint

227

314 - API update.

228 + Error message update.

229

316 - Will merge to 'next'.

230

231 +* jk/index-pack-w-more-threads (2020-08-21) 3 commits

232 + - index-pack: adjust default threading cap

233 + - p5302: count up to online-cpus for thread tests

234 + - p5302: disable thread-count parameter tests by default

235

319 -* jc/no-update-fetch-head (2020-08-18) 1 commit

320 - - fetch: optionally allow disabling FETCH_HEAD update

321 - (this branch is used by ds/maintenance-part-1, ds/maintenance-part-2 and jt/lazy-fetch.)

322 -

323 - "git fetch" learned --no-write-fetch-head option to avoid writing

324 - the FETCH_HEAD file.

236 + Long ago, we decided to use 3 threads by default when running the

237 + index-pack task in parallel, which has been adjusted a bit upwards.

238

239 Will merge to 'next'.

240

241

329 -* jt/lazy-fetch (2020-08-18) 7 commits

330 - - fetch-pack: remove no_dependents code

331 - - promisor-remote: lazy-fetch objects in subprocess

332 - - fetch-pack: do not lazy-fetch during ref iteration

333 - - fetch: only populate existing_refs if needed

334 - - fetch: avoid reading submodule config until needed

335 - - fetch: allow refspecs specified through stdin

336 - - negotiator/noop: add noop fetch negotiator

337 - (this branch uses jc/no-update-fetch-head; is tangled with ds/maintenance-part-1 and ds/maintenance-part-2.)

338 -

339 - Updates to on-demand fetching code in lazily cloned repositories.

340 -

341 -

342 -

343 -* mt/checkout-entry-dead-code-removal (2020-08-18) 1 commit

344 - - checkout_entry(): remove unreachable error() call

242 +* rp/apply-cached-doc (2020-08-20) 1 commit

243 + - git-apply.txt: update descriptions of --cached, --index

244

346 - Code clean-up.

347 -

348 - Will merge to 'next'.

245 + The description of --cached/--index options in "git apply --help"

246 + has been updated.

247

248 --------------------------------------------------

249 [Stalled]

@@ -433,6 +331,150 @@ repositories listed at

331 --------------------------------------------------

332 [Cooking]

333

334 +* dd/diff-customize-index-line-abbrev (2020-08-21) 2 commits

335 + - diff: index-line: respect --abbrev in object's name

336 + - t4013: improve diff-post-processor logic

337 +

338 + The output from the "diff" family of the commands had abbreviated

339 + object names of blobs involved in the patch, but its length was not

340 + affected by the --abbrev option. Now it is.

341 +

342 + Will merge to 'next'.

343 +

344 +

345 +* hn/refs-fetch-head-is-special (2020-08-19) 4 commits

346 + (merged to 'next' on 2020-08-21 at def233ab43)

347 + + refs: read FETCH_HEAD and MERGE_HEAD generically

348 + + refs: move gitdir into base ref_store

349 + + refs: fix comment about submodule ref_stores

350 + + refs: split off reading loose ref data in separate function

351 + (this branch is used by hn/refs-pseudorefs.)

352 +

353 + The FETCH_HEAD is now always read from the filesystem regardless of

354 + the ref backend in use, as its format is much richer than the

355 + normal refs, and written directly by "git fetch" as a plain file..

356 +

357 + Will merge to 'master'.

358 +

359 +

360 +* hv/ref-filter-misc (2020-08-17) 9 commits

361 + - ref-filter: add `sanitize` option for 'subject' atom

362 + - format-support: move `format_sanitized_subject()` from pretty

363 + - pretty: refactor `format_sanitized_subject()`

364 + - ref-filter: add `short` modifier to 'parent' atom

365 + - ref-filter: add `short` modifier to 'tree' atom

366 + - ref-filter: rename `objectname` related functions and fields

367 + - ref-filter: modify error messages in `grab_objectname()`

368 + - ref-filter: refactor `grab_objectname()`

369 + - ref-filter: support different email formats

370 +

371 + The "--format=" option to the "for-each-ref" command and friends

372 + learned a few more tricks, e.g. the ":short" suffix that applies to

373 + "objectname" now also can be used for "parent", "tree", etc.

374 +

375 +

376 +* jk/leakfix (2020-08-17) 7 commits

377 + (merged to 'next' on 2020-08-21 at a8b25a2657)

378 + + submodule--helper: fix leak of core.worktree value

379 + + config: fix leak in git_config_get_expiry_in_days()

380 + + config: drop git_config_get_string_const()

381 + + config: fix leaks from git_config_get_string_const()

382 + + checkout: fix leak of non-existent branch names

383 + + submodule--helper: use strbuf_release() to free strbufs

384 + + clear_pattern_list(): clear embedded hashmaps

385 +

386 + Code clean-up.

387 +

388 + Will merge to 'master'.

389 +

390 +

391 +* jk/refspecs-negative (2020-08-17) 3 commits

392 + - refspec: add support for negative refspecs

393 + - refspec: make sure stack refspec_item variables are zeroed

394 + - refspec: fix documentation referring to refspec_item

395 +

396 + "negative refspecs"

397 +

398 +

399 +* jt/fetch-pack-loosen-validation-with-packfile-uri (2020-08-14) 1 commit

400 + - fetch-pack: make packfile URIs work with transfer.fsckobjects

401 +

402 + Bugfix for "git fetch" when the packfile URI capability is in use.

403 +

404 + Need to pick up a reroll.

405 +

406 +

407 +* mr/diff-hide-stat-wo-textual-change (2020-08-19) 1 commit

408 + - diff: teach --stat to ignore uninteresting modifications

409 +

410 + Looking good.

411 +

412 +

413 +* pw/add-p-allowed-options-fix (2020-08-17) 2 commits

414 + - add -p: fix checking of user input

415 + - add -p: use ALLOC_GROW_BY instead of ALLOW_GROW

416 +

417 + "git add -p" update.

418 +

419 + Doubts?

420 + cf. <pull.702.git.1597670589.gitgitgadget@gmail.com>

421 + cf. <744e464f-6378-ef68-01c1-3b8bf63c54a4@gmail.com>

422 +

423 +

424 +* dl/subtree-docs (2020-08-18) 2 commits

425 + (merged to 'next' on 2020-08-19 at e1a8ea9d46)

426 + + contrib/subtree: document 'push' does not take '--squash'

427 + + contrib/subtree: fix "unsure" for --message in the document

428 +

429 + Doc updates for subtree (in contrib/)

430 +

431 + Will merge to 'master'.

432 +

433 +

434 +* en/mem-pool (2020-08-18) 3 commits

435 + (merged to 'next' on 2020-08-19 at eff9ad46f0)

436 + + mem-pool: use consistent pool variable name

437 + + mem-pool: use more standard initialization and finalization

438 + + mem-pool: add convenience functions for strdup and strndup

439 +

440 + API update.

441 +

442 + Will merge to 'master'.

443 +

444 +

445 +* jc/no-update-fetch-head (2020-08-18) 1 commit

446 + (merged to 'next' on 2020-08-19 at 68e1374ed6)

447 + + fetch: optionally allow disabling FETCH_HEAD update

448 + (this branch is used by ds/maintenance-part-1, ds/maintenance-part-2 and jt/lazy-fetch.)

449 +

450 + "git fetch" learned --no-write-fetch-head option to avoid writing

451 + the FETCH_HEAD file.

452 +

453 + Will merge to 'master'.

454 +

455 +

456 +* jt/lazy-fetch (2020-08-18) 7 commits

457 + - fetch-pack: remove no_dependents code

458 + - promisor-remote: lazy-fetch objects in subprocess

459 + - fetch-pack: do not lazy-fetch during ref iteration

460 + - fetch: only populate existing_refs if needed

461 + - fetch: avoid reading submodule config until needed

462 + - fetch: allow refspecs specified through stdin

463 + - negotiator/noop: add noop fetch negotiator

464 + (this branch uses jc/no-update-fetch-head; is tangled with ds/maintenance-part-1 and ds/maintenance-part-2.)

465 +

466 + Updates to on-demand fetching code in lazily cloned repositories.

467 +

468 +

469 +* mt/checkout-entry-dead-code-removal (2020-08-18) 1 commit

470 + (merged to 'next' on 2020-08-19 at 58866e5299)

471 + + checkout_entry(): remove unreachable error() call

472 +

473 + Code clean-up.

474 +

475 + Will merge to 'master'.

476 +

477 +

478 * jx/proc-receive-hook (2020-08-17) 10 commits

479 - doc: add documentation for the proc-receive hook

480 - transport: parse report options for tracking refs

@@ -451,45 +493,27 @@ repositories listed at

493 Needs review.

494

495

454 -* pw/rebase-i-more-options (2020-08-17) 5 commits

455 - - rebase: add --reset-author-date

456 - - rebase -i: support --ignore-date

457 - - rebase -i: support --committer-date-is-author-date

458 - - am: stop exporting GIT_COMMITTER_DATE

459 - - rebase -i: add --ignore-whitespace flag

496 +* pw/rebase-i-more-options (2020-08-19) 5 commits

497 + (merged to 'next' on 2020-08-21 at ade71fd49b)

498 + + rebase: add --reset-author-date

499 + + rebase -i: support --ignore-date

500 + + rebase -i: support --committer-date-is-author-date

501 + + am: stop exporting GIT_COMMITTER_DATE

502 + + rebase -i: add --ignore-whitespace flag

503

504 "git rebase -i" learns a bit more options.

505

463 - Waiting for a (hopefully final) review.

506 + Will merge to 'master'.

507

508

509 * rs/more-buffered-io (2020-08-17) 3 commits

467 - - upload-pack: use buffered I/O to talk to rev-list

468 - - midx: use buffered I/O to talk to pack-objects

469 - - connected: use buffered I/O to talk to rev-list

510 + (merged to 'next' on 2020-08-19 at 6d23a23bb2)

511 + + upload-pack: use buffered I/O to talk to rev-list

512 + + midx: use buffered I/O to talk to pack-objects

513 + + connected: use buffered I/O to talk to rev-list

514

515 Use more buffered I/O where we used to call many small write(2)s.

516

473 - Will merge to 'next'.

474 -

475 -

476 -* en/merge-tests (2020-08-10) 11 commits

477 - (merged to 'next' on 2020-08-13 at eab952350b)

478 - + t6425: be more flexible with rename/delete conflict messages

479 - + t642[23]: be more flexible for add/add conflicts involving pair renames

480 - + t6422, t6426: be more flexible for add/add conflicts involving renames

481 - + t6423: add an explanation about why one of the tests does not pass

482 - + t6416, t6423: clarify some comments and fix some typos

483 - + t6422: fix multiple errors with the mod6 test expectations

484 - + t6423: fix test setup for a couple tests

485 - + t6416, t6422: fix incorrect untracked file count

486 - + t6422: fix bad check against missing file

487 - + t6418: tighten delete/normalize conflict testcase

488 - + Collect merge-related tests to t64xx

489 -

490 - Updates to "git merge" tests, in preparation for a new merge

491 - strategy backend.

492 -

517 Will merge to 'master'.

518

519

@@ -504,15 +528,6 @@ repositories listed at

528 Will merge to 'master'.

529

530

507 -* rs/upload-pack-sigchain-fix (2020-08-11) 1 commit

508 - (merged to 'next' on 2020-08-17 at 997473f309)

509 - + upload-pack: remove superfluous sigchain_pop() call

510 -

511 - Code clean-up.

512 -

513 - Will merge to 'master'.

514 -

515 -

531 * tb/bloom-improvements (2020-08-11) 14 commits

532 - builtin/commit-graph.c: introduce '--max-new-filters=<n>'

533 - commit-graph: rename 'split_commit_graph_opts'

@@ -536,17 +551,6 @@ repositories listed at

551 cf. <20200811220503.GC66656@syl.lan>

552

553

539 -* ak/sequencer-fix-find-uniq-abbrev (2020-08-13) 1 commit

540 - (merged to 'next' on 2020-08-17 at 6ce0f1d111)

541 - + rebase -i: fix possibly wrong onto hash in todo

542 -

543 - Ring buffer with size 4 used for bin-hex translation resulted in a

544 - wrong object name in the sequencer's todo output, which has been

545 - corrected.

546 -

547 - Will merge to 'master'.

548 -

549 -

554 * en/dir-nonbare-embedded (2020-08-12) 2 commits

555 (merged to 'next' on 2020-08-17 at ab180b7fcb)

556 + dir: avoid prematurely marking nonbare repositories as matches

@@ -558,39 +562,6 @@ repositories listed at

562 Will merge to 'master'.

563

564

561 -* en/sequencer-merge-labels (2020-08-14) 1 commit

562 - (merged to 'next' on 2020-08-17 at 2010e329ed)

563 - + sequencer: avoid garbled merge machinery messages due to commit labels

564 -

565 - The commit labels used to explain each side of conflicted hunks

566 - placed by the sequencer machinery have been made more readable by

567 - humans.

568 -

569 - Will merge to 'master'.

570 -

571 -

572 -* jb/commit-graph-doc-fix (2020-08-13) 1 commit

573 - (merged to 'next' on 2020-08-17 at d83ee98955)

574 - + docs: commit-graph: fix some whitespace in the diagram

575 -

576 - Docfix.

577 -

578 - Will merge to 'master'.

579 -

580 -

581 -* jk/blame-coalesce-fix (2020-08-13) 3 commits

582 - (merged to 'next' on 2020-08-17 at 122c701ec7)

583 - + blame: only coalesce lines that are adjacent in result

584 - + t8003: factor setup out of coalesce test

585 - + t8003: check output of coalesced blame

586 -

587 - When given more than one target line ranges, "git blame -La,b

588 - -Lc,d" was over-eager to coalesce groups of original lines and

589 - showed incorrect results, which has been corrected.

590 -

591 - Will merge to 'master'.

592 -

593 -

565 * jk/slimmed-down (2020-08-13) 5 commits

566 - drop vcs-svn experiment

567 - make git-fast-import a builtin

@@ -613,46 +584,16 @@ repositories listed at

584 Will merge to 'master'.

585

586

616 -* pb/set-url-docfix (2020-08-13) 1 commit

617 - (merged to 'next' on 2020-08-17 at 19b56c6ebb)

618 - + fetch, pull doc: correct description of '--set-upstream'

619 -

620 - Doc fix.

621 -

622 - Will merge to 'master'.

623 -

624 -

625 -* pb/userdiff-fortran-update (2020-08-13) 2 commits

626 - (merged to 'next' on 2020-08-17 at 534af3f35a)

627 - + userdiff: improve Fortran xfuncname regex

628 - + userdiff: add tests for Fortran xfuncname regex

629 -

630 - The regexp to identify the function boundary for FORTRAN programs

631 - has been updated.

632 -

633 - Will merge to 'master'.

634 -

635 -

636 -* rs/preserve-merges-unused-code-removal (2020-08-12) 1 commit

637 - (merged to 'next' on 2020-08-17 at b96393455c)

638 - + rebase: remove unused function reschedule_last_action

639 -

640 - Code clean-up.

641 -

642 - Will merge to 'master'.

643 -

644 -

645 -* ss/t7401-modernize (2020-08-12) 4 commits

587 +* ss/t7401-modernize (2020-08-21) 5 commits

588 - t7401: add a NEEDSWORK

589 - t7401: change indentation for enhanced readability

648 - - t7401: change test_i18ncmp syntax for clarity

590 + - t7401: change syntax of test_i18ncmp calls for clarity

591 + - t7401: use 'short' instead of 'verify' and cut in rev-parse calls

592 - t7401: modernize style

593

594 Test clean-up.

595

653 - Expecting a reroll.

654 - cf. <c70f7bb5d1289f5318da7b99e41cf5828a451174.camel@gmail.com>

655 - Almost there, it seems.

596 + Looking good.

597

598

599 * ds/maintenance-part-2 (2020-08-18) 8 commits

@@ -671,12 +612,13 @@ repositories listed at

612

613

614 * ma/doc-sha-256-is-experimental (2020-08-17) 1 commit

674 - - Documentation: mark `--object-format=sha256` as experimental

615 + (merged to 'next' on 2020-08-19 at 9ccf6c399c)

616 + + Documentation: mark `--object-format=sha256` as experimental

617

618 The recent addition of SHA-256 support is marked as experimental in

619 the documentation.

620

679 - Will merge to 'next'.

621 + Will merge to 'master'.

622

623

624 * ss/submodule-summary-in-c (2020-08-12) 4 commits

@@ -691,13 +633,12 @@ repositories listed at

633 Will merge to 'master'.

634

635

694 -* am/ci-wsfix (2020-08-10) 1 commit

636 +* am/ci-wsfix (2020-08-21) 1 commit

637 - ci: fix inconsistent indentation

638

639 Aesthetic fix to a CI configuration file.

640

699 - Waiting for a reroll.

700 - It needs a better log message.

641 + Will merge to 'next'.

642

643

644 * es/init-no-separate-git-dir-in-bare (2020-08-10) 1 commit

@@ -715,16 +656,6 @@ repositories listed at

656 Will merge to 'master'.

657

658

718 -* rp/ita-diff-modefix (2020-08-09) 1 commit

719 - (merged to 'next' on 2020-08-17 at c03a9cfb6e)

720 - + diff-lib: use worktree mode in diffs from i-t-a entries

721 -

722 - "git diff [<tree-ish>] $path" for a $path that is marked with i-t-a

723 - bit was not showing the mode bits from the working tree.

724 -

725 - Will merge to 'master'.

726 -

727 -

659 * ds/maintenance-part-1 (2020-08-18) 11 commits

660 - maintenance: add trace2 regions for task execution

661 - maintenance: add auto condition for commit-graph task

What's cooking (2020/08) #05)