3c258e4845 · 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 (Feb 2019, #01; Tue, 5)

4 -X-master-at: 8feddda32cc50e928404788d7b9377c0b5f73f50

5 -X-next-at: b4d0f1c61aafd6cb5c3d9e6ee6bd99a036e3f21d

3 +Subject: What's cooking in git.git (Feb 2019, #02; Wed, 6)

4 +X-master-at: d62dad7a7dca3f6a65162bf0e52cdf6927958e78

5 +X-next-at: b571404aecccbd67727636813e633bcd481c0f3d

6

7 -What's cooking in git.git (Feb 2019, #01; Tue, 5)

7 +What's cooking in git.git (Feb 2019, #02; Wed, 6)

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

9

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

@@ -12,11 +12,13 @@ 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 -A handful more topics have been merged to 'master' and 'next'

16 -respectively. I have been hoping to keep this cycle short compared

17 -to other recent cycles but there are a few smallish changes that we

18 -should have in the upcoming release but are still not in 'next'. We

19 -will see what happens.

15 +An early preview of upcoming release 2.21-rc0 has been tagged with

16 +the sixth batch of topic. Usually I try to keep topics in 'next'

17 +for at least a week before merging them to 'master', in order to

18 +keep 'master' from getting too unstable, but for this batch, many

19 +topics spent only a day in 'next'. Hopefully the last minute bugs

20 +will have the same, if not better, likelihood to get discovered and

21 +fixed, whether the topics are in 'next' or '-rc0'. We'll see.

22

23 You can find the changes described here in the integration branches

24 of the repositories listed at

@@ -26,341 +28,179 @@ of the repositories listed at

28 --------------------------------------------------

29 [Graduated to "master"]

30

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

30 - (merged to 'next' on 2019-01-29 at 17c894dfec)

31 - + commit-graph write: use pack order when finding commits

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

33 -

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

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

36 -

37 -

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

39 - (merged to 'next' on 2019-01-29 at e086b1cba6)

40 - + commit-graph write: emit a percentage for all progress

41 - + commit-graph write: add itermediate progress

42 - + commit-graph write: remove empty line for readability

43 - + commit-graph write: add more descriptive progress output

44 - + commit-graph write: show progress for object search

45 - + commit-graph write: more descriptive "writing out" output

46 - + commit-graph write: add "Writing out" progress output

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

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

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

50 -

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

52 - file has been improved.

53 -

54 -

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

56 - (merged to 'next' on 2019-01-29 at 82f06b6774)

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

58 -

59 - "git instaweb" learned to drive http.server that comes with

60 - "batteries included" Python installation (both Python2 & 3).

61 -

62 -

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

64 - (merged to 'next' on 2019-01-29 at 89d690634d)

65 - + checkout: fix regression in checkout -b on intitial checkout

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

67 -

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

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

70 - and the working tree in normal cases, but there are corner cases

71 - that do require updates to the index and the working tree. Running

72 - it immediately after "git clone --no-checkout" is one of these

73 - cases that an earlier optimization kicked in incorrectly, which has

74 - been fixed.

75 -

76 -

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

78 - (merged to 'next' on 2019-01-29 at 0cd264f864)

79 - + helper/test-ref-store: fix "new-sha1" vs "old-sha1" typo

80 -

81 - An obvious typo in an assertion error message has been fixed.

82 -

83 -

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

85 - (merged to 'next' on 2019-01-29 at 5b520a6fd3)

86 - + doc: tidy asciidoc style

87 -

88 - Doc typo/stylo fixes.

89 -

90 -

91 -* jk/add-ignore-errors-bit-assignment-fix (2019-01-17) 1 commit

92 - (merged to 'next' on 2019-01-29 at a4ac7ccd4f)

93 - + add: use separate ADD_CACHE_RENORMALIZE flag

94 -

95 - "git add --ignore-errors" did not work as advertised and instead

96 - worked as an unintended synonym for "git add --renormalize", which

97 - has been fixed.

98 -

99 -

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

101 - (merged to 'next' on 2019-01-29 at 740df172e1)

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

103 -

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

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

106 - such a macro correctly. This has been corrected.

107 -

108 -

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

110 - (merged to 'next' on 2019-01-29 at 8bd04f1749)

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

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

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

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

115 - + diff: clear emitted_symbols flag after use

116 - + t4006: resurrect commented-out tests

117 -

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

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

120 - has been fixed.

121 -

122 -

123 -* js/abspath-part-inside-repo (2019-01-18) 1 commit

124 - (merged to 'next' on 2019-01-29 at ac642158ec)

125 - + abspath_part_inside_repo: respect core.ignoreCase

126 -

127 - On a case-insensitive filesystem, we failed to compare the part of

128 - the path that is above the worktree directory in an absolute

129 - pathname, which has been corrected.

130 -

131 -

132 -* js/commit-graph-chunk-table-fix (2019-01-15) 3 commits

133 - (merged to 'next' on 2019-01-29 at 65ea01d4f2)

134 - + Makefile: correct example fuzz build

135 - + commit-graph: fix buffer read-overflow

136 - + commit-graph, fuzz: add fuzzer for commit-graph

137 -

138 - The codepath to read from the commit-graph file attempted to read

139 - past the end of it when the file's table-of-contents was corrupt.

140 -

141 -

142 -* js/filter-options-should-use-plain-int (2019-01-15) 1 commit

143 - (merged to 'next' on 2019-01-18 at 6714547e6d)

144 - + filter-options: expand scaled numbers

145 - (this branch uses md/list-objects-filter-by-depth and sb/more-repo-in-api; is tangled with jt/get-reference-with-commit-graph.)

146 -

147 - Update the protocol message specification to allow only the limited

148 - use of scaled quantities. This is ensure potential compatibility

149 - issues will not go out of hand.

150 -

151 -

152 -* js/mingw-unc-path-w-backslashes (2019-01-18) 2 commits

153 - (merged to 'next' on 2019-01-29 at 3adc177c1e)

154 - + mingw: special-case arguments to `sh`

155 - + mingw (t5580): document bug when cloning from backslashed UNC paths

156 -

157 - In Git for Windows, "git clone \\server\share\path" etc. that uses

158 - UNC paths from command line had bad interaction with its shell

159 - emulation.

160 -

161 -

162 -* js/t6042-timing-fix (2019-01-17) 1 commit

163 - (merged to 'next' on 2019-01-29 at 9543c96249)

164 - + t6042: work around speed optimization on Windows

165 -

166 - Test update.

167 -

168 -

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

170 - (merged to 'next' on 2019-01-29 at bab6eabb20)

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

172 -

173 - Test fix for Windows.

174 -

175 -

176 -* jt/fetch-v2-sideband (2019-01-17) 5 commits

177 - (merged to 'next' on 2019-01-29 at c8c6f11f77)

178 - + tests: define GIT_TEST_SIDEBAND_ALL

179 - + {fetch,upload}-pack: sideband v2 fetch response

180 - + sideband: reverse its dependency on pkt-line

181 - + pkt-line: introduce struct packet_writer

182 - + Merge branch 'ms/packet-err-check' into jt/fetch-v2-sideband

183 - (this branch uses ms/packet-err-check.)

184 -

185 - "git fetch" and "git upload-pack" learned to send all exchange over

186 - the sideband channel while talking the v2 protocol.

187 -

188 -

189 -* jt/get-reference-with-commit-graph (2018-12-28) 1 commit

190 - (merged to 'next' on 2019-01-18 at bfc4eb9411)

191 - + revision: use commit graph in get_reference()

192 - (this branch uses sb/more-repo-in-api; is tangled with js/filter-options-should-use-plain-int and md/list-objects-filter-by-depth.)

193 -

194 - Micro-optimize the code that prepares commit objects to be walked

195 - by "git rev-list" when the commit-graph is available.

196 -

197 -

198 -* jt/namespaced-ls-refs-fix (2019-01-18) 1 commit

199 - (merged to 'next' on 2019-01-29 at 049530f499)

200 - + ls-refs: filter refs using namespace-stripped name

201 -

202 - Fix namespace support in protocol v2.

203 -

204 -

205 -* ld/git-p4-shelve-update-fix (2019-01-18) 2 commits

206 - (merged to 'next' on 2019-01-29 at 02e8752ec8)

207 - + git-p4: handle update of moved/copied files when updating a shelve

208 - + git-p4: add failing test for shelved CL update involving move/copy

209 -

210 - "git p4" failed to update a shelved change when there were moved

211 - files, which has been corrected.

212 -

213 -

214 -* md/list-objects-filter-by-depth (2019-01-15) 4 commits

215 - + tree:<depth>: skip some trees even when collecting omits

216 - + list-objects-filter: teach tree:# how to handle >0

217 - + Merge branch 'nd/the-index' into md/list-objects-filter-by-depth

218 - + Merge branch 'sb/more-repo-in-api' into md/list-objects-filter-by-depth

219 - (this branch is used by js/filter-options-should-use-plain-int; uses sb/more-repo-in-api; is tangled with jt/get-reference-with-commit-graph.)

220 -

31 +* ab/diff-tree-doc-fix (2019-02-04) 1 commit

32 + (merged to 'next' on 2019-02-05 at 123f48fa2e)

33 + + diff-tree doc: correct & remove wrong documentation

34

222 -* ms/packet-err-check (2019-01-02) 2 commits

223 - + pack-protocol.txt: accept error packets in any context

224 - + Use packet_reader instead of packet_read_line

225 - (this branch is used by jt/fetch-v2-sideband.)

35 + Doc fix.

36

227 - Error checking of data sent over the pack-protocol has been

228 - revamped so that error packets are always diagnosed properly.

37

38 +* bc/fetch-pack-clear-alternate-shallow (2019-02-06) 2 commits

39 + (merged to 'next' on 2019-02-06 at 2ebc2c9f87)

40 + + fetch-pack: clear alternate shallow in one more place

41 + (merged to 'next' on 2019-02-05 at 14392fb6b2)

42 + + fetch-pack: clear alternate shallow when complete

43

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

232 - (merged to 'next' on 2019-01-29 at b78e8841b0)

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

44 + "git fetch" over protocol v2 that needs to make a second connection

45 + to backfill tags did not clear a variable that holds shallow

46 + repository information correctly, leading to an access of freed

47 + piece of memory.

48

235 - "git fetch" output cleanup.

49

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

51 + (merged to 'next' on 2019-02-05 at a0a1e30471)

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

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

54

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

239 - (merged to 'next' on 2019-01-29 at 7c886f6c33)

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

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

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

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

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

58

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

244 - been corrected.

59

60 +* ds/push-sparse-tree-walk (2019-01-17) 5 commits

61 + (merged to 'next' on 2019-02-05 at 9fd04c84d6)

62 + + pack-objects: create GIT_TEST_PACK_SPARSE

63 + + pack-objects: create pack.useSparse setting

64 + + revision: implement sparse algorithm

65 + + list-objects: consume sparse tree walk

66 + + revision: add mark_tree_uninteresting_sparse

67

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

248 - (merged to 'next' on 2019-01-29 at 9d06993725)

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

68 + "git pack-objects" learned another algorithm to compute the set of

69 + objects to send, that trades the resulting packfile off to save

70 + traversal cost to favor small pushes.

71

251 - When GIT_SEQUENCE_EDITOR is set, the command was incorrectly

252 - started when modes of "git rebase" that implicitly uses the

253 - machinery for the interactive rebase are run, which has been

254 - corrected.

72

73 +* dt/cat-file-batch-ambiguous (2019-01-31) 2 commits

74 + (merged to 'next' on 2019-02-05 at 121d162945)

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

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

77

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

258 - + t/helper/test-repository: celebrate independence from the_repository

259 - + path.h: make REPO_GIT_PATH_FUNC repository agnostic

260 - + commit: prepare free_commit_buffer and release_commit_memory for any repo

261 - + commit-graph: convert remaining functions to handle any repo

262 - + submodule: don't add submodule as odb for push

263 - + submodule: use submodule repos for object lookup

264 - + pretty: prepare format_commit_message to handle arbitrary repositories

265 - + commit: prepare logmsg_reencode to handle arbitrary repositories

266 - + commit: prepare repo_unuse_commit_buffer to handle any repo

267 - + commit: prepare get_commit_buffer to handle any repo

268 - + commit-reach: prepare in_merge_bases[_many] to handle any repo

269 - + commit-reach: prepare get_merge_bases to handle any repo

270 - + commit-reach.c: allow get_merge_bases_many_0 to handle any repo

271 - + commit-reach.c: allow remove_redundant to handle any repo

272 - + commit-reach.c: allow merge_bases_many to handle any repo

273 - + commit-reach.c: allow paint_down_to_common to handle any repo

274 - + commit: allow parse_commit* to handle any repo

275 - + object: parse_object to honor its repository argument

276 - + object-store: prepare has_{sha1, object}_file to handle any repo

277 - + object-store: prepare read_object_file to deal with any repo

278 - + object-store: allow read_object_file_extended to read from any repo

279 - + packfile: allow has_packed_and_bad to handle arbitrary repositories

280 - + sha1_file: allow read_object to read objects in arbitrary repositories

281 - (this branch is used by js/filter-options-should-use-plain-int, jt/get-reference-with-commit-graph and md/list-objects-filter-by-depth.)

282 -

283 - The in-core repository instances are passed through more codepaths.

284 -

285 -

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

287 - (merged to 'next' on 2019-01-29 at cc714a044a)

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

289 -

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

291 - are promoted from unknown type to commit (e.g. a commit that is

292 - accessed via a tag that refers to it) were involved, which has been

293 - corrected.

78 + "git cat-file --batch" reported a dangling symbolic link by

79 + mistake, when it wanted to report that a given name is ambiguous.

80

81

296 -* sg/obstack-cast-function-type-fix (2019-01-17) 1 commit

297 - (merged to 'next' on 2019-01-29 at 568cafa7f4)

298 - + compat/obstack: fix -Wcast-function-type warnings

82 +* en/rebase-merge-on-sequencer (2019-01-07) 8 commits

83 + (merged to 'next' on 2019-02-05 at 88823d7c86)

84 + + rebase: implement --merge via the interactive machinery

85 + + rebase: define linearization ordering and enforce it

86 + + git-legacy-rebase: simplify unnecessary triply-nested if

87 + + git-rebase, sequencer: extend --quiet option for the interactive machinery

88 + + am, rebase--merge: do not overlook --skip'ed commits with post-rewrite

89 + + t5407: add a test demonstrating how interactive handles --skip differently

90 + + rebase: fix incompatible options error message

91 + + rebase: make builtin and legacy script error messages the same

92

300 - The compat/obstack code had casts that -Wcast-function-type

301 - compilation option found questionable.

93 + "git rebase --merge" as been reimplemented by reusing the internal

94 + machinery used for "git rebase -i".

95

96

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

305 - (merged to 'next' on 2019-01-29 at a9f7279d38)

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

97 +* jk/add-ignore-errors-bit-assignment-fix (2019-02-06) 1 commit

98 + (merged to 'next' on 2019-02-06 at 46cf370d8b)

99 + + add_to_index(): convert forgotten HASH_RENORMALIZE check

100

308 - Cocci rule update.

101 + A hotfix to an incomplete fix made earlier.

102

310 ---------------------------------------------------

311 -[New Topics]

103

313 -* ab/diff-tree-doc-fix (2019-02-04) 1 commit

314 - (merged to 'next' on 2019-02-05 at 123f48fa2e)

315 - + diff-tree doc: correct & remove wrong documentation

104 +* jk/autocrlf-overrides-eol-doc (2019-01-29) 2 commits

105 + (merged to 'next' on 2019-02-05 at 2b372ed6e9)

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

107 + + doc/gitattributes: clarify "autocrlf overrides eol"

108

317 - Doc fix.

109 + Documentation around core.crlf has been updated.

110

319 - Will merge to 'master'.

111

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

113 + (merged to 'next' on 2019-02-05 at 5cbc954aa5)

114 + + prefer "hash mismatch" to "sha1 mismatch"

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

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

117 + + sha1-file: drop has_sha1_file()

118 + + convert has_sha1_file() callers to has_object_file()

119 + + sha1-file: convert pass-through functions to object_id

120 + + sha1-file: modernize loose header/stream functions

121 + + sha1-file: modernize loose object file functions

122 + + http: use struct object_id instead of bare sha1

123 + + update comment references to sha1_object_info()

124 + + sha1-file: fix outdated sha1 comment references

125

322 -* bc/fetch-pack-clear-alternate-shallow (2019-02-04) 1 commit

323 - (merged to 'next' on 2019-02-05 at 14392fb6b2)

324 - + fetch-pack: clear alternate shallow when complete

126 + Code clean-up.

127

326 - "git fetch" over protocol v2 that needs to make a second connection

327 - to backfill tags did not clear a variable that holds shallow

328 - repository information correctly, leading to an access of freed

329 - piece of memory.

128

331 - Will merge to 'master'.

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

130 + (merged to 'next' on 2019-02-05 at 213400362c)

131 + + convert: drop path parameter from actual conversion functions

132 + + convert: drop len parameter from conversion checks

133 + + config: drop unused parameter from maybe_remove_section()

134 + + show_date_relative(): drop unused "tz" parameter

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

136 + + create_bundle(): drop unused "header" parameter

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

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

139

140 + Code cleanup.

141

334 -* dm/some-stdio-functions-are-macro-on-freebsd (2019-02-01) 1 commit

335 - - http: cast result to FILE *

142

337 - Variants of BSD define fileno(fh) as a macro, breaking a program

338 - that passes a "void *" to it.

143 +* js/rebase-am (2019-01-18) 4 commits

144 + (merged to 'next' on 2019-02-05 at cb92db8ecf)

145 + + built-in rebase: call `git am` directly

146 + + rebase: teach `reset_head()` to optionally skip the worktree

147 + + rebase: avoid double reflog entry when switching branches

148 + + rebase: move `reset_head()` into a better spot

149

340 - Expecting a reroll.

341 - cf. <49B9198C-53E5-42BD-8834-B1EDEB3332CB@usask.ca>

150 + Instead of going through "git-rebase--am" scriptlet to use the "am"

151 + backend, the built-in version of "git rebase" learned to drive the

152 + "am" backend directly.

153

154

344 -* en/combined-all-paths (2019-02-04) 1 commit

345 - - log,diff-tree: add --combined-all-names option

155 +* js/vsts-ci (2019-02-06) 22 commits

156 + (merged to 'next' on 2019-02-06 at fe1a5e9d5c)

157 + + test-date: drop unused parameter to getnanos()

158 + (merged to 'next' on 2019-02-05 at 7297a734c7)

159 + + ci: parallelize testing on Windows

160 + + ci: speed up Windows phase

161 + + tests: optionally skip bin-wrappers/

162 + + t0061: workaround issues with --with-dashes and RUNTIME_PREFIX

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

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

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

166 + + tests: avoid calling Perl just to determine file sizes

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

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

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

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

171 + + Add a build definition for Azure DevOps

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

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

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

175 + + ci: use a junction on Windows instead of a symlink

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

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

178 + + ci: rename the library of common functions

179 + + travis: fix skipping tagged releases

180

347 - Output from "diff --cc" did not show the original paths when the

348 - merge involved renames. A new option adds the paths in the

349 - original trees to the output.

181 + Prepare to run test suite on Azure Pipeline.

182

351 - Expecting a reroll.

352 - cf. <CABPp-BGyL5BAejK-P-EdscFdH3C6uR7e6CbgNe-9doy-mkw-vg@mail.gmail.com>

183

184 +* km/init-doc-typofix (2019-01-31) 1 commit

185 + (merged to 'next' on 2019-02-05 at ee90a62a1c)

186 + + init docs: correct a punctuation typo

187

355 -* js/rebase-i-redo-exec-fix (2019-02-05) 1 commit

356 - - Revert "rebase: introduce a shortcut for --reschedule-failed-exec"

188 + Docfix.

189

358 - For "rebase -i --reschedule-failed-exec", we do not want the "-y"

359 - shortcut after all.

190

361 - Waiting for a clarification for the log message.

362 - cf. <xmqqzhraru5x.fsf@gitster-ct.c.googlers.com>

191 +* lt/date-human (2019-01-29) 5 commits

192 + (merged to 'next' on 2019-02-05 at f2850c9fc0)

193 + + Add `human` date format tests.

194 + + Add `human` format to test-tool

195 + + Add 'human' date format documentation

196 + + Replace the proposed 'auto' mode with 'auto:'

197 + + Add 'human' date format

198

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

200 + on how far the time is from the current time has been introduced.

201 + "--date=auto" can be used to use this new format when the output is

202 + going to the pager or to the terminal and otherwise the default

203 + format.

204

205

206 * ma/doc-diff-usage-fix (2019-02-04) 1 commit

@@ -371,8 +211,6 @@ of the repositories listed at

211 top-level of the working tree did not show the usage string

212 correctly, which has been fixed.

213

374 - Will merge to 'master'.

375 -

214

215 * nd/commit-doc (2019-02-04) 1 commit

216 (merged to 'next' on 2019-02-05 at 07b341767e)

@@ -380,8 +218,6 @@ of the repositories listed at

218

219 Doc update.

220

383 - Will merge to 'master'.

384 -

221

222 * nd/help-align-command-desc (2019-01-31) 1 commit

223 (merged to 'next' on 2019-02-05 at 8339c1a46e)

@@ -390,7 +226,32 @@ of the repositories listed at

226 Output from "git help" was not correctly aligned, which has been

227 fixed.

228

393 - Will merge to 'master'.

229 +

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

231 + (merged to 'next' on 2019-02-05 at 71b37c09a8)

232 + + cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch

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

234 + + merge-recursive.c: remove implicit dependency on the_repository

235 + + merge-recursive.c: remove implicit dependency on the_index

236 + + sha1-name.c: remove implicit dependency on the_index

237 + + read-cache.c: replace update_index_if_able with repo_&

238 + + read-cache.c: kill read_index()

239 + + checkout: avoid the_index when possible

240 + + repository.c: replace hold_locked_index() with repo_hold_locked_index()

241 + + notes-utils.c: remove the_repository references

242 + + grep: use grep_opt->repo instead of explict repo argument

243 +

244 + The assumption to work on the single "in-core index" instance has

245 + been reduced from the library-ish part of the codebase.

246 +

247 +

248 +* pw/rebase-x-sanity-check (2019-01-29) 1 commit

249 + (merged to 'next' on 2019-02-05 at 9f087a617a)

250 + + rebase -x: sanity check command

251 +

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

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

254 + rejected upfront.

255

256

257 * rj/sparse-flags (2019-02-05) 2 commits

@@ -401,7 +262,13 @@ of the repositories listed at

262 Use of the sparse tool got easier to customize from the command

263 line to help developers.

264

404 - Will merge to 'master'.

265 +

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

267 + (merged to 'next' on 2019-02-05 at 85da48a9a5)

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

269 +

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

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

272

273

274 * sg/travis-osx-brew-breakage-workaround (2019-02-04) 1 commit

@@ -415,7 +282,16 @@ of the repositories listed at

282 have worked around a breakage by recent updates to homebrew, which

283 has fixed itself already).

284

418 - Will merge to 'master'.

285 +

286 +* sg/travis-specific-cc (2019-01-17) 4 commits

287 + (merged to 'next' on 2019-02-05 at 3ecb3b6755)

288 + + travis-ci: build with the right compiler

289 + + travis-ci: switch to Xcode 10.1 macOS image

290 + + travis-ci: don't be '--quiet' when running the tests

291 + + .gitignore: ignore external debug symbols from GCC on macOS

292 +

293 + The travis CI scripts have been corrected to build Git with the

294 + compiler(s) of our choice.

295

296

297 * sh/submodule-summary-abbrev-fix (2019-02-04) 1 commit

@@ -427,8 +303,6 @@ of the repositories listed at

303 has been improved to let "rev-parse --short" scale the length of

304 the abbreviation with the size of the repository.

305

430 - Will merge to 'master'.

431 -

306

307 * sl/const (2019-02-04) 1 commit

308 (merged to 'next' on 2019-02-05 at a085045a37)

@@ -436,8 +310,6 @@ of the repositories listed at

310

311 Code cleanup.

312

439 - Will merge to 'master'.

440 -

313

314 * ss/describe-dirty-in-the-right-directory (2019-02-04) 2 commits

315 (merged to 'next' on 2019-02-05 at e4a3303e12)

@@ -449,97 +321,145 @@ of the repositories listed at

321 worktree specified by the user by mistake, which has been

322 corrected.

323

452 - Will merge to 'master'.

324 +

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

326 + (merged to 'next' on 2019-02-05 at dec383d823)

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

328 +

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

330 +

331 +

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

333 + (merged to 'next' on 2019-02-05 at 43ac83e06e)

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

335 +

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

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

338 + generated by using iconv.

339 +

340 +

341 +* tt/bisect-in-c (2019-01-02) 7 commits

342 + (merged to 'next' on 2019-02-05 at 1e5e00d24e)

343 + + bisect--helper: `bisect_start` shell function partially in C

344 + + bisect--helper: `get_terms` & `bisect_terms` shell function in C

345 + + bisect--helper: `bisect_next_check` shell function in C

346 + + bisect--helper: `check_and_set_terms` shell function in C

347 + + wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()

348 + + bisect--helper: `bisect_write` shell function in C

349 + + bisect--helper: `bisect_reset` shell function in C

350 +

351 + More code in "git bisect" has been rewritten in C.

352

353 --------------------------------------------------

455 -[Cooking]

354 +[New Topics]

355

457 -* km/init-doc-typofix (2019-01-31) 1 commit

458 - (merged to 'next' on 2019-02-05 at ee90a62a1c)

459 - + init docs: correct a punctuation typo

356 +* dl/complete-submodule-absorbgitdirs (2019-02-06) 1 commit

357 + (merged to 'next' on 2019-02-06 at c4e0cd535a)

358 + + completion: complete git submodule absorbgitdirs

359 +

360 + Command-line completion (in contrib/) learned to tab-complete the

361 + "git submodule absorbgitdirs" subcommand.

362 +

363 + Will cook in 'next'.

364

461 - Docfix.

365 +

366 +* ld/git-p4-remove-flakey-test (2019-02-06) 1 commit

367 + (merged to 'next' on 2019-02-06 at 0100bce8b6)

368 + + git-p4: remove ticket expiry test

369 +

370 + A flakey "p4" test has been removed.

371

372 Will merge to 'master'.

373

374

466 -* ds/commit-graph-format-v2 (2019-01-29) 8 commits

467 - - SQUASH : misnamed variables and style fix

468 - - commit-graph: test verifying a corrupt v2 header

469 - - commit-graph: implement file format version 2

470 - - commit-graph: add --version=<n> option

471 - - commit-graph: create new version flags

472 - - commit-graph: collapse parameters into flags

473 - - commit-graph: return with errors during write

474 - - Merge branch 'bc/sha-256' into ds/commit-graph-format-v2

375 +* nd/checkout-noisy-unmerge (2019-02-06) 2 commits

376 + (merged to 'next' on 2019-02-06 at 7fe9bd5b4e)

377 + + checkout: count and print -m paths separately

378 + + checkout: update count-checkouts messages

379

476 - Introduce version 2 of the commit-graph format to correct

477 - deficiency in the initial version.

380 + "git checkout [<tree-ish>] <pathspec>" started reporting the number

381 + of paths that have got updated recently, but the same messages were

382 + given when "git checkout -m <pathspec>" to unresolve conflicts that

383 + have just been resolved. The message now reports these unresolved

384 + paths separately from the paths that are checked out from the index.

385

386 + Will merge to 'master'.

387

480 -* ds/coverage-prove (2019-01-29) 1 commit

481 - - Makefile: add coverage-prove target

388

483 - A new target "coverage-prove" to run the coverage test under

484 - "prove" has been added.

389 +* jt/test-protocol-version (2019-02-06) 9 commits

390 + - remote-curl: in v2, fill credentials if needed

391 + - t5552: compensate for v2 filtering ref adv.

392 + - tests: fix protocol version for overspecifications

393 + - t5700: only run with protocol version 1

394 + - t5512: compensate for v0 only sending HEAD symrefs

395 + - t5503: fix overspecification of trace expectation

396 + - tests: always test fetch of unreachable with v0

397 + - tests: define GIT_TEST_PROTOCOL_VERSION

398 + - Merge branch 'js/protocol-advertise-multi' into jt/test-protocol-version

399 + (this branch uses js/protocol-advertise-multi.)

400

486 - Will merge to 'next'.

401 + Help developers by making it easier to run most of the tests under

402 + different versions of over-the-wire protocols.

403

404 +--------------------------------------------------

405 +[Cooking]

406

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

490 - (merged to 'next' on 2019-02-05 at a0a1e30471)

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

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

407 +* dm/some-stdio-functions-are-macro-on-freebsd (2019-02-01) 1 commit

408 + - http: cast result to FILE *

409

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

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

496 - parser did not know about the longhand, which has been corrected.

410 + Variants of BSD define fileno(fh) as a macro, breaking a program

411 + that passes a "void *" to it.

412

498 - Will merge to 'master'.

413 + Expecting a reroll.

414 + cf. <49B9198C-53E5-42BD-8834-B1EDEB3332CB@usask.ca>

415

416

501 -* dt/cat-file-batch-ambiguous (2019-01-31) 2 commits

502 - (merged to 'next' on 2019-02-05 at 121d162945)

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

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

417 +* en/combined-all-paths (2019-02-04) 1 commit

418 + - log,diff-tree: add --combined-all-names option

419

506 - "git cat-file --batch" reported a dangling symbolic link by

507 - mistake, when it wanted to report that a given name is ambiguous.

420 + Output from "diff --cc" did not show the original paths when the

421 + merge involved renames. A new option adds the paths in the

422 + original trees to the output.

423

509 - Will merge to 'master'.

424 + Expecting a reroll.

425 + cf. <CABPp-BGyL5BAejK-P-EdscFdH3C6uR7e6CbgNe-9doy-mkw-vg@mail.gmail.com>

426

427

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

513 - (merged to 'next' on 2019-02-05 at 85da48a9a5)

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

428 +* js/rebase-i-redo-exec-fix (2019-02-06) 1 commit

429 + (merged to 'next' on 2019-02-06 at 9f99bee768)

430 + + Revert "rebase: introduce a shortcut for --reschedule-failed-exec"

431

516 - "git submodule update" learned to abort early when core.worktree

517 - for the submodule is not set correctly to prevent spreading damage.

432 + For "rebase -i --reschedule-failed-exec", we do not want the "-y"

433 + shortcut after all.

434

435 Will merge to 'master'.

436

437

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

523 - (merged to 'next' on 2019-02-05 at dec383d823)

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

525 -

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

438 +* ds/commit-graph-format-v2 (2019-01-29) 8 commits

439 + - SQUASH : misnamed variables and style fix

440 + - commit-graph: test verifying a corrupt v2 header

441 + - commit-graph: implement file format version 2

442 + - commit-graph: add --version=<n> option

443 + - commit-graph: create new version flags

444 + - commit-graph: collapse parameters into flags

445 + - commit-graph: return with errors during write

446 + - Merge branch 'bc/sha-256' into ds/commit-graph-format-v2

447

528 - Will merge to 'master'.

448 + Introduce version 2 of the commit-graph format to correct

449 + deficiency in the initial version.

450

451

531 -* tb/utf-16-le-with-explicit-bom (2019-01-31) 1 commit

532 - (merged to 'next' on 2019-02-05 at 43ac83e06e)

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

452 +* ds/coverage-prove (2019-01-29) 1 commit

453 + (merged to 'next' on 2019-02-06 at 0fc57228ec)

454 + + Makefile: add coverage-prove target

455

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

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

537 - generated by using iconv.

456 + A new target "coverage-prove" to run the coverage test under

457 + "prove" has been added.

458

459 Will merge to 'master'.

460

461

542 -* jh/trace2 (2019-02-01) 15 commits

462 +* jh/trace2 (2019-02-06) 15 commits

463 - trace2: add for_each macros to clang-format

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

465 - trace2:data: add subverb for rebase

@@ -558,24 +478,7 @@ of the repositories listed at

478

479 A more structured way to obtain execution trace has been added.

480

561 - Still needs some fix-ups.

562 - cf. <d91d1d89-5759-2006-7b38-4211db5988af@jeffhostetler.com>

563 -

564 -

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

566 - (merged to 'next' on 2019-02-05 at 213400362c)

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

568 - + convert: drop len parameter from conversion checks

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

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

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

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

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

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

575 -

576 - Code cleanup.

577 -

578 - Will merge to 'master'.

481 + Will merge to 'next'.

482

483

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

@@ -591,27 +494,6 @@ of the repositories listed at

494 The beginning of "hg evolve" mimicry.

495

496

594 -* jk/autocrlf-overrides-eol-doc (2019-01-29) 2 commits

595 - (merged to 'next' on 2019-02-05 at 2b372ed6e9)

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

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

598 -

599 - Documentation around core.crlf has been updated.

600 -

601 - Will merge to 'master'.

602 -

603 -

604 -* pw/rebase-x-sanity-check (2019-01-29) 1 commit

605 - (merged to 'next' on 2019-02-05 at 9f087a617a)

606 - + rebase -x: sanity check command

607 -

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

609 - the command is incapable of handling such a command. It now is

610 - rejected upfront.

611 -

612 - Will merge to 'master'.

613 -

614 -

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

498 - blame: add a config option to mark ignored lines

499 - blame: add the ability to ignore commits and their changes

@@ -660,6 +542,8 @@ of the repositories listed at

542 Update the implementation of pack-redundant for performance in a

543 repository with many packfiles.

544

545 + Will merge to 'next'.

546 +

547

548 * nd/config-move-to (2019-01-14) 7 commits

549 - config.h: fix hdr-check warnings

@@ -673,19 +557,6 @@ of the repositories listed at

557 Needs review.

558

559

676 -* sg/travis-specific-cc (2019-01-17) 4 commits

677 - (merged to 'next' on 2019-02-05 at 3ecb3b6755)

678 - + travis-ci: build with the right compiler

679 - + travis-ci: switch to Xcode 10.1 macOS image

680 - + travis-ci: don't be '--quiet' when running the tests

681 - + .gitignore: ignore external debug symbols from GCC on macOS

682 -

683 - The travis CI scripts have been corrected to build Git with the

684 - compiler(s) of our choice.

685 -

686 - Will merge to 'master'.

687 -

688 -

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

561 - setup: fix memory leaks with `struct repository_format`

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

@@ -696,97 +567,15 @@ of the repositories listed at

567 cf. <20190124001450.GR423984@genre.crustytoothpaste.net>

568

569

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

700 - (merged to 'next' on 2019-02-05 at 71b37c09a8)

701 - + cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch

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

703 - + merge-recursive.c: remove implicit dependency on the_repository

704 - + merge-recursive.c: remove implicit dependency on the_index

705 - + sha1-name.c: remove implicit dependency on the_index

706 - + read-cache.c: replace update_index_if_able with repo_&

707 - + read-cache.c: kill read_index()

708 - + checkout: avoid the_index when possible

709 - + repository.c: replace hold_locked_index() with repo_hold_locked_index()

710 - + notes-utils.c: remove the_repository references

711 - + grep: use grep_opt->repo instead of explict repo argument

712 -

713 - The assumption to work on the single "in-core index" instance has

714 - been reduced from the library-ish part of the codebase.

715 -

716 - Will merge to 'master'.

717 -

718 -

570 * wh/author-committer-ident-config (2019-02-04) 1 commit

720 - - config: allow giving separate author and committer idents

571 + (merged to 'next' on 2019-02-06 at 6ab8bfa199)

572 + + config: allow giving separate author and committer idents

573

574 Four new configuration variables {author,committer}.{name,email}

575 have been introduced to override user.{name,email} in more specific

576 cases.

577

726 -

727 -* js/rebase-am (2019-01-18) 4 commits

728 - (merged to 'next' on 2019-02-05 at cb92db8ecf)

729 - + built-in rebase: call `git am` directly

730 - + rebase: teach `reset_head()` to optionally skip the worktree

731 - + rebase: avoid double reflog entry when switching branches

732 - + rebase: move `reset_head()` into a better spot

733 -

734 - Instead of going through "git-rebase--am" scriptlet to use the "am"

735 - backend, the built-in version of "git rebase" learned to drive the

736 - "am" backend directly.

737 -

738 - Will merge to 'master'.

739 -

740 -

741 -* tt/bisect-in-c (2019-01-02) 7 commits

742 - (merged to 'next' on 2019-02-05 at 1e5e00d24e)

743 - + bisect--helper: `bisect_start` shell function partially in C

744 - + bisect--helper: `get_terms` & `bisect_terms` shell function in C

745 - + bisect--helper: `bisect_next_check` shell function in C

746 - + bisect--helper: `check_and_set_terms` shell function in C

747 - + wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()

748 - + bisect--helper: `bisect_write` shell function in C

749 - + bisect--helper: `bisect_reset` shell function in C

750 -

751 - More code in "git bisect" has been rewritten in C.

752 -

753 - Will merge to 'master'.

754 -

755 -

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

757 - (merged to 'next' on 2019-02-05 at 5cbc954aa5)

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

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

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

761 - + sha1-file: drop has_sha1_file()

762 - + convert has_sha1_file() callers to has_object_file()

763 - + sha1-file: convert pass-through functions to object_id

764 - + sha1-file: modernize loose header/stream functions

765 - + sha1-file: modernize loose object file functions

766 - + http: use struct object_id instead of bare sha1

767 - + update comment references to sha1_object_info()

768 - + sha1-file: fix outdated sha1 comment references

769 -

770 - Code clean-up.

771 -

772 - Will merge to 'master'.

773 -

774 -

775 -* lt/date-human (2019-01-29) 5 commits

776 - (merged to 'next' on 2019-02-05 at f2850c9fc0)

777 - + Add `human` date format tests.

778 - + Add `human` format to test-tool

779 - + Add 'human' date format documentation

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

781 - + Add 'human' date format

782 -

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

784 - on how far the time is from the current time has been introduced.

785 - "--date=auto" can be used to use this new format when the output is

786 - going to the pager or to the terminal and otherwise the default

787 - format.

788 -

789 - Will merge to 'master'.

578 + Will cook in 'next'.

579

580

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

@@ -808,21 +597,6 @@ of the repositories listed at

597 Comments?

598

599

811 -* ds/push-sparse-tree-walk (2019-01-17) 5 commits

812 - (merged to 'next' on 2019-02-05 at 9fd04c84d6)

813 - + pack-objects: create GIT_TEST_PACK_SPARSE

814 - + pack-objects: create pack.useSparse setting

815 - + revision: implement sparse algorithm

816 - + list-objects: consume sparse tree walk

817 - + revision: add mark_tree_uninteresting_sparse

818 -

819 - "git pack-objects" learned another algorithm to compute the set of

820 - objects to send, that trades the resulting packfile off to save

821 - traversal cost to favor small pushes.

822 -

823 - Will merge to 'master'.

824 -

825 -

600 * tg/checkout-no-overlay (2019-02-04) 9 commits

601 (merged to 'next' on 2019-02-04 at 9968bcf4fb)

602 + revert "checkout: introduce checkout.overlayMode config"

@@ -847,10 +621,11 @@ of the repositories listed at

621

622

623 * dl/merge-cleanup-scissors-fix (2019-01-27) 4 commits

850 - - merge: add scissors line on merge conflict

851 - - merge: cleanup messages like commit

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

853 - - commit: extract cleanup_mode functions to sequencer

624 + (merged to 'next' on 2019-02-06 at f4fe5d759a)

625 + + merge: add scissors line on merge conflict

626 + + merge: cleanup messages like commit

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

628 + + commit: extract cleanup_mode functions to sequencer

629

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

631 conflicted merge was shown above the scissors line when the

@@ -858,23 +633,24 @@ of the repositories listed at

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

634 help the user explain the merge better.

635

861 - Will merge to 'next'.

636 + Will cook in 'next'.

637

638

639 * aw/pretty-trailers (2019-01-29) 7 commits

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

866 - - strbuf: separate callback for strbuf_expand:ing literals

867 - - pretty: add support for "valueonly" option in %(trailers)

868 - - pretty: allow showing specific trailers

869 - - pretty: single return path in %(trailers) handling

870 - - pretty: allow %(trailers) options with explicit value

871 - - doc: group pretty-format.txt placeholders descriptions

640 + (merged to 'next' on 2019-02-06 at b7e5437702)

641 + + pretty: add support for separator option in %(trailers)

642 + + strbuf: separate callback for strbuf_expand:ing literals

643 + + pretty: add support for "valueonly" option in %(trailers)

644 + + pretty: allow showing specific trailers

645 + + pretty: single return path in %(trailers) handling

646 + + pretty: allow %(trailers) options with explicit value

647 + + doc: group pretty-format.txt placeholders descriptions

648

649 The %(trailers) formatter in "git log --format=..." now allows to

650 optionally pick trailers selectively by keyword, show only values,

651 etc.

652

877 - Comments?

653 + Will cook in 'next'.

654

655

656 * jn/unknown-index-extensions (2018-11-21) 2 commits

@@ -887,23 +663,6 @@ of the repositories listed at

663 Expecting a reroll.

664

665

890 -* en/rebase-merge-on-sequencer (2019-01-07) 8 commits

891 - (merged to 'next' on 2019-02-05 at 88823d7c86)

892 - + rebase: implement --merge via the interactive machinery

893 - + rebase: define linearization ordering and enforce it

894 - + git-legacy-rebase: simplify unnecessary triply-nested if

895 - + git-rebase, sequencer: extend --quiet option for the interactive machinery

896 - + am, rebase--merge: do not overlook --skip'ed commits with post-rewrite

897 - + t5407: add a test demonstrating how interactive handles --skip differently

898 - + rebase: fix incompatible options error message

899 - + rebase: make builtin and legacy script error messages the same

900 -

901 - "git rebase --merge" as been reimplemented by reusing the internal

902 - machinery used for "git rebase -i".

903 -

904 - Will merge to 'master'.

905 -

906 -

666 * dl/remote-save-to-push (2018-12-11) 1 commit

667 - remote: add --save-to-push option to git remote set-url

668

@@ -916,25 +675,24 @@ of the repositories listed at

675

676 * js/protocol-advertise-multi (2018-12-28) 1 commit

677 - protocol: advertise multiple supported versions

678 + (this branch is used by jt/test-protocol-version.)

679

680 The transport layer has been updated so that the protocol version

681 used can be negotiated between the parties, by the initiator

682 listing the protocol versions it is willing to talk, and the other

683 side choosing from one of them.

684

925 - Is this ready for 'next'?

926 -

685

928 -* js/smart-http-detect-remote-error (2019-01-07) 3 commits

929 - - remote-curl: die on server-side errors

930 - - remote-curl: tighten "version 2" check for smart-http

931 - - remote-curl: refactor smart-http discovery

686 +* js/smart-http-detect-remote-error (2019-02-06) 3 commits

687 + (merged to 'next' on 2019-02-06 at ec1a6f67c1)

688 + + t5551: test server-side ERR packet

689 + + remote-curl: tighten "version 2" check for smart-http

690 + + remote-curl: refactor smart-http discovery

691

692 Some errors from the other side coming over smart HTTP transport

693 were not noticed, which has been corrected.

694

936 - This needs to be rebased on top of a more recent 'master' that has

937 - ms/packet-err-check.

695 + Will merge to 'master'.

696

697

698 * nb/branch-show-other-worktrees-head (2019-02-01) 3 commits

@@ -947,44 +705,16 @@ of the repositories listed at

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

706 with '*' in front.

707

708 + The top one probably deserves retitling.

709 The second one is of dubious value.

710

711

953 -* js/vsts-ci (2019-01-29) 21 commits

954 - (merged to 'next' on 2019-02-05 at 7297a734c7)

955 - + ci: parallelize testing on Windows

956 - + ci: speed up Windows phase

957 - + tests: optionally skip bin-wrappers/

958 - + t0061: workaround issues with --with-dashes and RUNTIME_PREFIX

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

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

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

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

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

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

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

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

967 - + Add a build definition for Azure DevOps

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

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

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

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

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

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

974 - + ci: rename the library of common functions

975 - + travis: fix skipping tagged releases

976 -

977 - Prepare to run test suite on Azure Pipeline.

978 -

979 - Will merge to 'master'.

980 -

981 -

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

713 - branch: introduce --show-current display option

714

715 "git branch" learned a new subcommand "--show-current".

716

987 - I am personally not yet quite convinced if this is worth pursuing.

717 + Will merge to 'next'.

718

719

720 * mk/use-size-t-in-zlib (2018-10-15) 1 commit

@@ -1067,11 +797,7 @@ of the repositories listed at

797

798 "git stash" rewritten in C.

799

1070 - On hold, waiting for a response

1071 - cf. <xmqqzhraru5x.fsf@gitster-ct.c.googlers.com>

1072 - I personally do not mind "oops, this was wrong and I am too lazy to

1073 - redo the history to clean it up" too much, but waiting briefly to

1074 - give the final chance to do so.

800 + Will merge to 'next'.

801

802

803 * pw/add-p-select (2018-07-26) 4 commits

What's cooking (2019/02 #02)