f9efee0135 · 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 (Jan 2019, #03; Fri, 18)

3 +Subject: What's cooking in git.git (Jan 2019, #04; Mon, 28)

4 X-master-at: 16a465bc018d09e9d7bbbdc5f40a7fb99c21f8ef

5 X-next-at: aa96b0ce6b0fa4fa4cc6870f1a3aff3878967bfa

6

7 -What's cooking in git.git (Jan 2019, #03; Fri, 18)

7 +What's cooking in git.git (Jan 2019, #04; Mon, 28)

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

9

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

@@ -18,284 +18,231 @@ of the repositories listed at

18 http://git-blame.blogspot.com/p/git-public-repositories.html

19

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

21 -[Graduated to "master"]

22 -

23 -* cy/completion-typofix (2019-01-03) 1 commit

24 - (merged to 'next' on 2019-01-08 at 6c6f01a07d)

25 - + completion: fix typo in git-completion.bash

26 -

27 - Typofix.

28 -

29 -

30 -* cy/zsh-completion-SP-in-path (2019-01-03) 2 commits

31 - (merged to 'next' on 2019-01-08 at fee27de30b)

32 - + completion: treat results of git ls-tree as file paths

33 - + zsh: complete unquoted paths with spaces correctly

34 -

35 - With zsh, "git cmd path<TAB>" was completed to "git cmd path name"

36 - when the completed path has a special character like SP in it,

37 - without any attempt to keep "path name" a single filename. This

38 - has been fixed to complete it to "git cmd path\ name" just like

39 - Bash completion does.

40 -

21 +[New Topics]

22

42 -* ds/commit-graph-assert-missing-parents (2019-01-02) 1 commit

43 - (merged to 'next' on 2019-01-08 at d141f063e0)

44 - + commit-graph: writing missing parents is a BUG

23 +* br/commit-tree-fully-spelled-gpg-sign-option (2019-01-22) 2 commits

24 + - commit-tree: add missing --gpg-sign flag

25 + - t7510: invoke git as part of &&-chain

26

46 - Tightening error checking in commit-graph writer.

27 + The documentation of "git commit-tree" said that the command

28 + understands "--gpg-sign" in addition to "-S", but the command line

29 + parser did not know about the longhand, which has been corrected.

30

31 + Will merge to 'next'.

32

49 -* ds/gc-doc-typofix (2019-01-08) 1 commit

50 - (merged to 'next' on 2019-01-08 at f21ffc83e0)

51 - + git-gc.txt: fix typo about gc.writeCommitGraph

33

53 - Typofix.

34 +* dt/cat-file-batch-ambiguous (2019-01-18) 2 commits

35 + - t1512: test ambiguous cat-file --batch and --batch-output

36 + - Do not print 'dangling' for cat-file in case of ambiguity

37

38 + Needswork on the tip commit.

39 + cf. <20190123111117.GS840@szeder.dev>

40

56 -* ed/simplify-setup-git-dir (2019-01-03) 1 commit

57 - (merged to 'next' on 2019-01-08 at 8722c7c2ef)

58 - + Simplify handling of setup_git_directory_gently() failure cases.

41

60 - Code simplification.

42 +* jk/attr-macro-fix (2019-01-22) 1 commit

43 + - attr: do not mark queried macros as unset

44

45 + Asking "git check-attr" about a macro (e.g. "binary") on a specific

46 + path did not work correctly, even though "git check-attr -a" listed

47 + such a macro correctly. This has been corrected.

48

63 -* en/show-ref-doc-fix (2019-01-10) 1 commit

64 - (merged to 'next' on 2019-01-14 at f875bfb9a4)

65 - + git-show-ref.txt: fix order of flags

49 + Will merge to 'next'.

50

67 - Doc update.

51

52 +* js/test-git-installed (2019-01-22) 1 commit

53 + - tests: explicitly use `test-tool.exe` on Windows

54

70 -* es/doc-worktree-guessremote-config (2018-12-28) 1 commit

71 - (merged to 'next' on 2019-01-08 at f1dc5e39a6)

72 - + doc/config: do a better job of introducing 'worktree.guessRemote'

55 + Test fix for Windows.

56

74 - Doc clarification.

57 + Will merge to 'next'.

58

59

77 -* ew/ban-strncat (2019-01-02) 1 commit

78 - (merged to 'next' on 2019-01-08 at 3bba2ae2bb)

79 - + banned.h: mark strncat() as banned

60 +* ph/pack-objects-mutex-fix (2019-01-28) 2 commits

61 + - pack-objects: merge read_lock and lock in packing_data struct

62 + - pack-objects: move read mutex to packing_data struct

63

81 - The "strncat()" function is now among the banned functions.

64 + "git pack-objects" incorrectly used uninitialized mutex, which has

65 + been corrected.

66

67 + Will merge to 'next'.

68

84 -* jk/dev-build-format-security (2019-01-07) 1 commit

85 - (merged to 'next' on 2019-01-08 at 3761ab7026)

86 - + config.mak.dev: add -Wall, primarily for -Wformat, to help autoconf users

69

88 - Earlier we added "-Wformat-security" to developer builds, assuming

89 - that "-Wall" (which includes "-Wformat" which in turn is required

90 - to use "-Wformat-security") is always in effect. This is not true

91 - when config.mak.autogen is in use, unfortunately. This has been

92 - fixed by unconditionally adding "-Wall" to developer builds.

70 +* sb/submodule-abort-update-upon-config-failure (2019-01-18) 1 commit

71 + - git-submodule: abort if core.worktree could not be set correctly

72

73 + "git submodule update" learned to abort early when core.worktree

74 + for the submodule is not set correctly to prevent spreading damage.

75

95 -* jn/stripspace-wo-repository (2018-12-26) 1 commit

96 - (merged to 'next' on 2019-01-08 at 81815821c9)

97 - + stripspace: allow -s/-c outside git repository

76 + Will merge to 'next'.

77

99 - "git stripspace" should be usable outside a git repository, but

100 - under the "-s" or "-c" mode, it didn't.

78

79 +* tb/test-lint-sed-options (2019-01-28) 1 commit

80 + - test-lint: only use only sed [-n] [-e command] [-f command_file]

81

103 -* js/gc-repack-close-before-remove (2019-01-11) 1 commit

104 - (merged to 'next' on 2019-01-14 at 9daedfee40)

105 - + gc/repack: release packs when needed

82 + The test lint learned to catch non-portable "sed" options.

83

107 - "git gc" and "git repack" did not close the open packfiles that

108 - they found unneeded before removing them, which didn't work on a

109 - platform incapable of removing an open file. This has been

110 - corrected.

84 + Will merge to 'next'.

85

86

113 -* la/quiltimport-keep-non-patch (2019-01-07) 1 commit

114 - (merged to 'next' on 2019-01-08 at 37cb490792)

115 - + git-quiltimport: add --keep-non-patch option

87 +* tb/utf-16-le-with-explicit-bom (2019-01-22) 1 commit

88 + - Support working-tree-encoding "UTF-16LE-BOM"

89

117 - "git quiltimport" learned "--keep-non-patch" option.

90 + A new encoding UTF-16LE-BOM has been invented to force encoding to

91 + UTF-16 with BOM in little endian byte order, which cannot be directly

92 + generated by using iconv.

93

94 + Will merge to 'next'.

95

120 -* ma/asciidoctor (2018-12-26) 3 commits

121 - (merged to 'next' on 2019-01-08 at 3cfd4ad6cb)

122 - + git-status.txt: render tables correctly under Asciidoctor

123 - + Documentation: do not nest open blocks

124 - + git-column.txt: fix section header

96

126 - Some of the documentation pages formatted incorrectly with

127 - Asciidoctor, which have been fixed.

97 +* ja/doc-style-fix (2019-01-23) 1 commit

98 + - doc: tidy asciidoc style

99

100 + Doc typo/stylo fixes.

101

130 -* mm/multimail-1.5 (2019-01-07) 1 commit

131 - (merged to 'next' on 2019-01-08 at 8c872af48e)

132 - + git-multimail: update to release 1.5.0

102 + Will merge to 'next'.

103

134 - Update "git multimail" from the upstream.

104

105 +* az/instaweb-py3-http-server (2019-01-28) 1 commit

106 + - git-instaweb: add Python builtin http.server support

107

137 -* nd/style-opening-brace (2018-12-10) 1 commit

138 - (merged to 'next' on 2019-01-08 at 80de026e14)

139 - + style: the opening '{' of a function is in a separate line

108 + "git instaweb" learned to drive http.server that comes with

109 + "batteries included" Python installation (both Python2 & 3).

110

141 - Code clean-up.

111 + Will merge to 'next'.

112

113

144 -* nd/worktree-remove-with-uninitialized-submodules (2019-01-07) 1 commit

145 - (merged to 'next' on 2019-01-08 at e19cfe8741)

146 - + worktree: allow to (re)move worktrees with uninitialized submodules

114 +* jh/trace2 (2019-01-27) 15 commits

115 + - trace2: fix hdr-check warnings

116 + - trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh

117 + - trace2:data: add subverb for rebase

118 + - trace2:data: add subverb to reset command

119 + - trace2:data: add subverb to checkout command

120 + - pack-objects: add trace2 regions

121 + - trace2:data: add trace2 instrumentation to index read/write

122 + - trace2:data: add trace2 hook classification

123 + - trace2:data: add trace2 transport child classification

124 + - trace2:data: add trace2 sub-process classification

125 + - trace2:data: add editor/pager child classification

126 + - trace2:data: add trace2 regions to wt-status

127 + - trace2: collect platform-specific process information

128 + - trace2: create new combined trace facility

129 + - trace2: Documentation/technical/api-trace2.txt

130

148 - "git worktree remove" and "git worktree move" refused to work when

149 - there is a submodule involved. This has been loosened to ignore

150 - uninitialized submodules.

131 + Expecting a reroll.

132 + cf. <e1bd52e3-1ac5-b08c-d1f6-a7fa63ebf0cf@jeffhostetler.com>

133

134

153 -* ot/ref-filter-object-info (2019-01-10) 7 commits

154 - (merged to 'next' on 2019-01-10 at 9e740568ce)

155 - + ref-filter: give uintmax_t to format with %PRIuMAX

156 - (merged to 'next' on 2019-01-08 at 0a4d4ed36a)

157 - + ref-filter: add docs for new options

158 - + ref-filter: add tests for deltabase

159 - + ref-filter: add deltabase option

160 - + ref-filter: add tests for objectsize:disk

161 - + ref-filter: add check for negative file size

162 - + ref-filter: add objectsize:disk option

135 +* jk/diff-cc-stat-fixes (2019-01-24) 6 commits

136 + - combine-diff: treat --dirstat like --stat

137 + - combine-diff: treat --summary like --stat

138 + - combine-diff: treat --shortstat like --stat

139 + - combine-diff: factor out stat-format mask

140 + - diff: clear emitted_symbols flag after use

141 + - t4006: resurrect commented-out tests

142

164 - The "--format=<placeholder>" option of for-each-ref, branch and tag

165 - learned to show a few more traits of objects that can be learned by

166 - the object_info API.

143 + "git diff --color-moved --cc --stat -p" did not work well due to

144 + funny interaction between a bug in color-moved and the rest, which

145 + has been fixed.

146

147 + Will merge to 'next'.

148

169 -* po/git-p4-wo-login (2019-01-07) 1 commit

170 - (merged to 'next' on 2019-01-08 at a7cc58d6b9)

171 - + git-p4: fix problem when p4 login is not necessary

149

173 - "git p4" update.

150 +* jk/unused-parameter-cleanup (2019-01-24) 8 commits

151 + - convert: drop path parameter from actual conversion functions

152 + - convert: drop len parameter from conversion checks

153 + - config: drop unused parameter from maybe_remove_section()

154 + - show_date_relative(): drop unused "tz" parameter

155 + - column: drop unused "opts" parameter in item_length()

156 + - create_bundle(): drop unused "header" parameter

157 + - apply: drop unused "def" parameter from find_name_gnu()

158 + - match-trees: drop unused path parameter from score functions

159

160 + Code cleanup.

161

176 -* rb/hpe (2019-01-03) 5 commits

177 - (merged to 'next' on 2019-01-08 at 52d6995399)

178 - + compat/regex/regcomp.c: define intptr_t and uintptr_t on NonStop

179 - + git-compat-util.h: add FLOSS headers for HPE NonStop

180 - + config.mak.uname: support for modern HPE NonStop config.

181 - + transport-helper: drop read/write errno checks

182 - + transport-helper: use xread instead of read

162

184 - Portability updates for the HPE NonStop platform.

163 +* nd/fetch-compact-update (2019-01-27) 1 commit

164 + - fetch: prefer suffix substitution in compact fetch.output

165

166 + "git fetch" output cleanup.

167

187 -* rs/loose-object-cache-perffix (2019-01-08) 4 commits

188 - (merged to 'next' on 2019-01-08 at 36e355e099)

189 - + object-store: retire odb_load_loose_cache()

190 - + object-store: use one oid_array per subdirectory for loose cache

191 - + object-store: factor out odb_clear_loose_cache()

192 - + object-store: factor out odb_loose_cache()

193 - (this branch is used by jk/loose-object-cache-oid.)

168 + Will merge to 'next'.

169

195 - The loose object cache used to optimize existence look-up has been

196 - updated.

170

171 +* sg/object-as-type-commit-graph-fix (2019-01-27) 1 commit

172 + - object_as_type: initialize commit-graph-related fields of 'struct commit'

173

199 -* rs/sha1-file-close-mapped-file-on-error (2019-01-07) 1 commit

200 - (merged to 'next' on 2019-01-08 at 5841cbc153)

201 - + sha1-file: close fd of empty file in map_sha1_file_1()

174 + The commit-graph facility did not work when in-core objects that

175 + are promoted from unknown type to commit (e.g. a commit that is

176 + accessed via a tag that refers to it) were involved, which has been

177 + corrected.

178

203 - Code clean-up.

179 + Will merge to 'next'.

180

181

206 -* sb/submodule-fetchjobs-default-to-one (2018-12-14) 1 commit

207 - (merged to 'next' on 2019-01-08 at 97a522ef5e)

208 - + submodule update: run at most one fetch job unless otherwise set

182 +* sg/strbuf-addbuf-cocci (2019-01-27) 1 commit

183 + - strbuf.cocci: suggest strbuf_addbuf() to add one strbuf to an other

184

210 - "git submodule update" ought to use a single job unless asked, but

211 - by mistake used multiple jobs, which has been fixed.

185 + Cocci rule update.

186

187 + Will merge to 'next'.

188

214 -* sb/submodule-unset-core-worktree-when-worktree-is-lost (2018-12-26) 4 commits

215 - (merged to 'next' on 2019-01-08 at 38f3175a2b)

216 - + submodule deinit: unset core.worktree

217 - + submodule--helper: fix BUG message in ensure_core_worktree

218 - + submodule: unset core.worktree if no working tree is present

219 - + submodule update: add regression test with old style setups

189

221 - The core.worktree setting in a submodule repository should not be

222 - pointing at a directory when the submodule loses its working tree

223 - (e.g. getting deinit'ed), but the code did not properly maintain

224 - this invariant.

190 +* sx/evolve (2019-01-27) 8 commits

191 + - evolve: add the 'git change list' command

192 + - evolve: implement the 'git change' command

193 + - evolve: add support for writing metacommits

194 + - evolve: add the change-table structure

195 + - evolve: add support for parsing metacommits

196 + - ref-filter: add the metas namespace to ref-filter

197 + - sha1-array: implement oid_array_readonly_contains()

198 + - technical doc: add a design doc for the evolve command

199

200 + The beginning of "hg evolve" mimickery.

201

227 -* sg/stress-test (2019-01-07) 8 commits

228 - (merged to 'next' on 2019-01-08 at 2a65cea5f9)

229 - + test-lib: add the '--stress' option to run a test repeatedly under load

230 - + test-lib-functions: introduce the 'test_set_port' helper function

231 - + test-lib: set $TRASH_DIRECTORY earlier

232 - + test-lib: consolidate naming of test-results paths

233 - + test-lib: parse command line options earlier

234 - + test-lib: parse options in a for loop to keep $@ intact

235 - + test-lib: extract Bash version check for '-x' tracing

236 - + test-lib: translate SIGTERM and SIGHUP to an exit

237 - (this branch uses sg/test-bash-version-fix.)

202

239 - Flaky tests can now be repeatedly run under load with the

240 - "--stress" option.

203 +* jk/autocrlf-overrides-eol-doc (2019-01-28) 2 commits

204 + - docs/config: clarify "text property" in core.eol

205 + - doc/gitattributes: clarify "autocrlf overrides eol"

206

207 + Documentation around core.crlf has been updated.

208

243 -* sg/test-bash-version-fix (2019-01-03) 2 commits

244 - (merged to 'next' on 2019-01-08 at f83a0628a0)

245 - + Merge branch 'sg/test-bash-version-fix'

246 - + test-lib: check Bash version for '-x' without using shell arrays

247 - (this branch is used by sg/stress-test.)

209 + Will merge to 'next'.

210

249 - The test suite tried to see if it is run under bash, but the check

250 - itself failed under some other implementations of shell (notably

251 - under NetBSD). This has been corrected.

211

212 +* pw/no-editor-in-rebase-i-implicit (2019-01-28) 1 commit

213 + - implicit interactive rebase: don't run sequence editor

214

254 -* so/cherry-pick-always-allow-m1 (2019-01-07) 4 commits

255 - (merged to 'next' on 2019-01-08 at 2b790fec25)

256 - + t3506: validate '-m 1 -ff' is now accepted for non-merge commits

257 - + t3502: validate '-m 1' argument is now accepted for non-merge commits

258 - + cherry-pick: do not error on non-merge commits when '-m 1' is specified

259 - + t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks

215 + When GIT_SEQUENCE_EDITOR is set, the command was incorrectly

216 + started when modes of "git rebase" that implicitly uses the

217 + machinery for the interactive rebase are run, which has been

218 + corrected.

219

261 - "git cherry-pick -m1" was forbidden when picking a non-merge

262 - commit, even though there _is_ parent number 1 for such a commit.

263 - This was done to avoid mistakes back when "cherry-pick" was about

264 - picking a single commit, but is no longer useful with "cherry-pick"

265 - that can pick a range of commits. Now the "-m$num" option is

266 - allowed when picking any commit, as long as $num names an existing

267 - parent of the commit.

220 + Will merge to 'next'.

221

269 - Technically this is a backward incompatible change; hopefully

270 - nobody is relying on the error-checking behaviour.

222

223 +* pw/rebase-x-sanity-check (2019-01-28) 1 commit

224 + - rebase -x: sanity check command

225

273 -* tg/t5570-drop-racy-test (2019-01-07) 2 commits

274 - (merged to 'next' on 2019-01-08 at 9fc753bbdc)

275 - + Revert "t/lib-git-daemon: record daemon log"

276 - + t5570: drop racy test

226 + "git rebase -x $cmd" did not reject multi-line command, even though

227 + the command is incapable of handling such a command. It now is

228 + rejected upfront.

229

278 - An inherently racy test that caused intermittent failures has been

279 - removed.

230 + Will merge to 'next'.

231

232 --------------------------------------------------

282 -[New Topics]

233 +[Cooking]

234

284 -* ab/commit-graph-write-optim (2019-01-17) 1 commit

235 +* ab/commit-graph-write-optim (2019-01-22) 1 commit

236 - commit-graph write: use pack order when finding commits

286 - (this branch uses ab/commit-graph-write-progress.)

237 + (this branch is used by ab/commit-graph-write-progress and ds/commit-graph-format-v2.)

238

239 The codepath to write out commit-graph has been optimized by

240 following the usual pattern of visiting objects in in-pack order.

241

291 - This is taken hostage of the other topic; it may be slightly better

292 - if the dependency were the other way around, to allow this to

293 - graduate faster without waiting for the other.

294 -

295 - Needs sign-off.

242 + Will merge to 'next'.

243

244

298 -* ab/commit-graph-write-progress (2019-01-17) 9 commits

245 +* ab/commit-graph-write-progress (2019-01-23) 9 commits

246 - commit-graph write: emit a percentage for all progress

247 - commit-graph write: add itermediate progress

248 - commit-graph write: remove empty line for readability

@@ -303,15 +250,14 @@ of the repositories listed at

250 - commit-graph write: show progress for object search

251 - commit-graph write: more descriptive "writing out" output

252 - commit-graph write: add "Writing out" progress output

306 - - commit-graph: don't call write_graph_chunk_large_edges() unnecessarily

307 - - commit-graph: rename 'num_extra_edges' variable to 'num_large_edges'

308 - (this branch is used by ab/commit-graph-write-optim.)

253 + - commit-graph: don't call write_graph_chunk_extra_edges() unnecessarily

254 + - commit-graph: rename "large edges" to "extra edges"

255 + (this branch is used by ds/commit-graph-format-v2; uses ab/commit-graph-write-optim.)

256

257 The codepath to show progress meter while writing out commit-graph

258 file has been improved.

259

313 - Proposed updates for the bottom two have been raised.

314 - cf. <20190118170549.30403-1-szeder.dev@gmail.com>

260 + Will merge to 'next'.

261

262

263 * cc/test-ref-store-typofix (2019-01-17) 1 commit

@@ -359,9 +305,9 @@ of the repositories listed at

305 Will merge to 'next'.

306

307

362 -* bp/checkout-new-branch-optim (2019-01-18) 2 commits

308 +* bp/checkout-new-branch-optim (2019-01-23) 2 commits

309 - checkout: fix regression in checkout -b on intitial checkout

364 - - checkout: add test to demonstrate regression with checkout -b on initial commit

310 + - checkout: add test demonstrating regression with checkout -b on initial commit

311

312 "git checkout -b <new> [HEAD]" to create a new branch from the

313 current commit and check it out ought to be a no-op in the index

@@ -371,7 +317,7 @@ of the repositories listed at

317 these cases that an earlier optimization kicked in incorrectly,

318 which has been fixed.

319

374 - Seems to break an existing test...

320 + Will merge to 'next'.

321

322

323 * br/blame-ignore (2019-01-18) 3 commits

@@ -393,69 +339,7 @@ of the repositories listed at

339 Will merge to 'next'.

340

341

396 -* nd/diff-parseopt (2019-01-18) 77 commits

397 - - SQUASH???

398 - - am: avoid diff_opt_parse()

399 - - diff --no-index: use parse_options() instead of diff_opt_parse()

400 - - range-diff: use parse_options() instead of diff_opt_parse()

401 - - diff.c: allow --no-color-moved-ws

402 - - diff.c: convert --color-moved-ws

403 - - diff.c: convert --color-moved

404 - - diff.c: convert --inter-hunk-context

405 - - diff.c: convert --no-prefix

406 - - diff.c: convert --line-prefix

407 - - diff.c: convert --[src|dst]-prefix

408 - - diff.c: convert --[no-]abbrev

409 - - diff.c: convert --diff-filter

410 - - diff.c: convert --find-object

411 - - diff.c: convert -O

412 - - diff.c: convert --pickaxe-all|--pickaxe-regex

413 - - diff.c: convert -S|-G

414 - - diff.c: convert -l

415 - - diff.c: convert -z

416 - - diff.c: convert --ita-[in]visible-in-index

417 - - diff.c: convert --ws-error-highlight

418 - - diff.c: convert --submodule

419 - - diff.c: convert --ignore-submodules

420 - - diff.c: convert --textconv

421 - - diff.c: convert --ext-diff

422 - - diff.c: convert --quiet

423 - - diff.c: convert --exit-code

424 - - diff.c: convert --color-words

425 - - diff.c: convert --word-diff-regex

426 - - diff.c: convert --word-diff

427 - - diff.c: convert --[no-]color

428 - - diff.c: convert --[no-]follow

429 - - diff.c: convert -R

430 - - diff.c: convert -a|--text

431 - - diff.c: convert --full-index

432 - - diff.c: convert --binary

433 - - diff.c: convert --anchored

434 - - diff.c: convert --diff-algorithm

435 - - diff.c: convert --histogram

436 - - diff.c: convert --patience

437 - - diff.c: convert --[no-]indent-heuristic

438 - - diff.c: convert --ignore-some-changes

439 - - diff.c: convert --[no-]minimal

440 - - diff.c: convert --relative

441 - - diff.c: convert --no-renames|--[no--rename-empty

442 - - diff.c: convert --find-copies-harder

443 - - diff.c: convert -C|--find-copies

444 - - diff.c: convert -D|--irreversible-delete

445 - - diff.c: convert -M|--find-renames

446 - - diff.c: convert -B|--break-rewrites

447 - - diff.c: convert --output-*

448 - - diff.c: convert --[no-]compact-summary

449 - - diff.c: convert --stat*

450 - - diff.c: convert -s|--no-patch

451 - - diff.c: convert --name-status

452 - - diff.c: convert --name-only

453 - - diff.c: convert --patch-with-stat

454 - - diff.c: convert --summary

455 - - diff.c: convert --check

456 - - diff.c: convert --dirstat and friends

457 - - diff.c: convert --numstat and --shortstat

458 - - diff.c: convert --patch-with-raw

342 +* nd/diff-parseopt (2019-01-27) 14 commits

343 - diff.c: convert --raw

344 - diff.c: convert -W|--[no-]function-context

345 - diff.c: convert -U|--unified

@@ -468,17 +352,14 @@ of the repositories listed at

352 - parse-options: stop abusing 'callback' for lowlevel callbacks

353 - parse-options: add OPT_BITOP()

354 - parse-options: disable option abbreviation with PARSE_OPT_KEEP_UNKNOWN

471 - - parse-options: allow keep-unknown + stop-at-non-opt combination

355 - parse-options: add one-shot mode

356 - parse-options.h: remove extern on function prototypes

357

358 The diff machinery, one of the oldest parts of the system, which

359 long predates the parse-options API, uses fairly long and complex

477 - handcrafted option parser. This has been rewritten to use the

360 + handcrafted option parser. This is being rewritten to use the

361 parse-options API.

362

480 ---------------------------------------------------

481 -[Cooking]

363

364 * sc/pack-redundant (2019-01-14) 5 commits

365 - pack-redundant: consistent sort method

@@ -654,18 +535,17 @@ of the repositories listed at

535 Will merge to 'next'.

536

537

657 -* ma/clear-repository-format (2019-01-14) 3 commits

658 - - setup: add `clear_repository_format()`

659 - - setup: do not use invalid `repository_format`

538 +* ma/clear-repository-format (2019-01-23) 2 commits

539 + - setup: fix memory leaks with `struct repository_format`

540 - setup: free old value before setting `work_tree`

541

542 The setup code has been cleaned up to avoid leaks around the

543 repository_format structure.

544

665 - cf. <20190115193112.GE4886@sigill.intra.peff.net>

545 + cf. <20190124001450.GR423984@genre.crustytoothpaste.net>

546

547

668 -* nd/the-index-final (2019-01-14) 11 commits

548 +* nd/the-index-final (2019-01-24) 11 commits

549 - cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch

550 - read-cache.c: remove the_* from index_has_changes()

551 - merge-recursive.c: remove implicit dependency on the_repository

@@ -806,10 +686,10 @@ of the repositories listed at

686

687

688 * jk/loose-object-cache-oid (2019-01-08) 11 commits

809 - . prefer "hash mismatch" to "sha1 mismatch"

810 - . sha1-file: avoid "sha1 file" for generic use in messages

811 - . sha1-file: prefer "loose object file" to "sha1 file" in messages

812 - . sha1-file: drop has_sha1_file()

689 + - prefer "hash mismatch" to "sha1 mismatch"

690 + - sha1-file: avoid "sha1 file" for generic use in messages

691 + - sha1-file: prefer "loose object file" to "sha1 file" in messages

692 + - sha1-file: drop has_sha1_file()

693 - convert has_sha1_file() callers to has_object_file()

694 - sha1-file: convert pass-through functions to object_id

695 - sha1-file: modernize loose header/stream functions

@@ -820,17 +700,14 @@ of the repositories listed at

700

701 Code clean-up.

702

823 - Later parts of the series crash heavily with sb/more-repo-in-api

824 - and are left out for now. I am not sure if keeping that other

825 - topic is worth keeping to block the clean-up value of this topic

826 - which is probably more clear.

703 + Will merge to 'next'.

704

705

829 -* lt/date-human (2019-01-18) 5 commits

706 +* lt/date-human (2019-01-22) 5 commits

707 - Add `human` date format tests.

708 - Add `human` format to test-tool

709 - Add 'human' date format documentation

833 - - Remove the proposed use of auto as secondary way to specify human

710 + - Replace the proposed 'auto' mode with 'auto:'

711 - Add 'human' date format

712

713 A new date format "--date=human" that morphs its output depending

@@ -839,13 +716,11 @@ of the repositories listed at

716 goint to the pager or to the terminal and otherwise the default

717 format.

718

842 - The design around "auto" may need to be rethought.

843 - The tests need to be updated, too.

844 - cf. <20190104075034.GA26014@sigill.intra.peff.net>

845 - cf. <a5412274-028f-3662-e4f5-dbbcad4d9a40@iee.org>

719 + Will merge to 'next'.

720

721

848 -* ds/midx-expire-repack (2019-01-10) 9 commits

722 +* ds/midx-expire-repack (2019-01-27) 10 commits

723 + - midx: add test that 'expire' respects .keep files

724 - multi-pack-index: test expire while adding packs

725 - midx: implement midx_repack()

726 - multi-pack-index: prepare 'repack' subcommand

@@ -955,9 +830,12 @@ of the repositories listed at

830 Will merge to 'master'.

831

832

958 -* dl/merge-cleanup-scissors-fix (2018-11-21) 2 commits

833 +* dl/merge-cleanup-scissors-fix (2019-01-27) 5 commits

834 + - init docs: correct a punctuation typo

835 - merge: add scissors line on merge conflict

836 + - merge: cleanup messages like commit

837 - t7600: clean up 'merge --squash c3 with c7' test

838 + - commit: extract cleanup_mode functions to sequencer

839

840 The list of conflicted paths shown in the editor while concluding a

841 conflicted merge was shown above the scissors line when the

@@ -965,8 +843,6 @@ of the repositories listed at

843 out just like the list of updated paths and other information to

844 help the user explain the merge better.

845

968 - Ready?

969 -

846

847 * aw/pretty-trailers (2018-12-09) 7 commits

848 - pretty: add support for separator option in %(trailers)

@@ -1041,9 +917,9 @@ of the repositories listed at

917 Will merge to 'next'.

918

919

1044 -* nb/branch-show-other-worktrees-head (2019-01-15) 3 commits

1045 - - branch: add an extra verbose output displaying worktree path for checked out branch

1046 - - branch: mark and color a branch that is checked out in a linked worktree differently

920 +* nb/branch-show-other-worktrees-head (2019-01-23) 3 commits

921 + - branch: add an extra verbose output displaying worktree path for refs checked out in a linked worktree

922 + - branch: mark and color a branch differently if it is checked out in a linked worktree

923 - ref-filter: add worktreepath atom

924

925 "git branch --list" learned to show branches that are checked out

@@ -1051,10 +927,7 @@ of the repositories listed at

927 '+', similar to the way the currently checked out branch is shown

928 with '*' in front.

929

1054 - The second one is of dubious value. The third one requires extra

1055 - "-v" to trigger extra information, but a new feature that improves

1056 - human-readable Porcelain output, it probably shouldn't. Needs

1057 - sign-off.

930 + The second one is of dubious value. Needs sign-off.

931

932

933 * sb/more-repo-in-api (2018-12-28) 23 commits

@@ -1102,6 +975,7 @@ of the repositories listed at

975 + hex: introduce functions to print arbitrary hashes

976 + sha1-file: provide functions to look up hash algorithms

977 + sha1-file: rename algorithm to "sha1"

978 + (this branch is used by ds/commit-graph-format-v2.)

979

980 Add sha-256 hash and plug it through the code to allow building Git

981 with the "NewHash".

@@ -1109,31 +983,32 @@ of the repositories listed at

983 Will merge to 'master'.

984

985

1112 -* js/vsts-ci (2018-10-16) 13 commits

1113 - . travis: fix skipping tagged releases

1114 - . README: add a build badge (status of the Azure Pipelines build)

1115 - . tests: record more stderr with --write-junit-xml in case of failure

1116 - . tests: include detailed trace logs with --write-junit-xml upon failure

1117 - . git-p4: use `test_atexit` to kill the daemon

1118 - . git-daemon: use `test_atexit` in the tests

1119 - . tests: introduce `test_atexit`

1120 - . ci: add a build definition for Azure DevOps

1121 - . ci/lib.sh: add support for Azure Pipelines

1122 - . tests: optionally write results as JUnit-style .xml

1123 - . test-date: add a subcommand to measure times in shell scripts

1124 - . ci/lib.sh: encapsulate Travis-specific things

1125 - . ci: rename the library of common functions

1126 -

1127 - Prepare to run test suite on Azure DevOps.

1128 -

1129 - Ejected out of 'pu', as doing so seems to help other topics get

1130 - tested at TravisCI.

1131 -

1132 - https://travis-ci.org/git/git/builds/452713184 is a sample of a

1133 - build whose tests on 4 hang (with this series in). Ejecting it

1134 - gave us https://travis-ci.org/git/git/builds/452778963 which still

1135 - shows breakages from other topics not yet in 'next', but at least

1136 - the tests do not stall.

986 +* js/vsts-ci (2019-01-28) 21 commits

987 + - ci: parallelize testing on Windows

988 + - ci: speed up Windows phase

989 + - tests: optionally skip bin-wrappers/

990 + - t0061: fix with --with-dashes and RUNTIME_PREFIX

991 + - tests: add t/helper/ to the PATH with --with-dashes

992 + - mingw: try to work around issues with the test cleanup

993 + - tests: include detailed trace logs with --write-junit-xml upon failure

994 + - tests: avoid calling Perl just to determine file sizes

995 + - README: add a build badge (status of the Azure Pipelines build)

996 + - mingw: be more generous when wrapping up the setitimer() emulation

997 + - ci: use git-sdk-64-minimal build artifact

998 + - ci: add a Windows job to the Azure Pipelines definition

999 + - Add a build definition for Azure DevOps

1000 + - ci/lib.sh: add support for Azure Pipelines

1001 + - tests: optionally write results as JUnit-style .xml

1002 + - test-date: add a subcommand to measure times in shell scripts

1003 + - ci: use a junction on Windows instead of a symlink

1004 + - ci: inherit --jobs via MAKEFLAGS in run-build-and-tests

1005 + - ci/lib.sh: encapsulate Travis-specific things

1006 + - ci: rename the library of common functions

1007 + - travis: fix skipping tagged releases

1008 +

1009 + Prepare to run test suite on Azure Pipeline.

1010 +

1011 + Will merge to 'next'.

1012

1013

1014 * du/branch-show-current (2018-10-26) 1 commit

What's cooking (2019/01 #04)