465bcaa73d · 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 (Jul 2019, #02; Tue, 9)

4 -X-master-at: 6d5b26420848ec3bc7eae46a7ffa54f20276249d

5 -X-next-at: f5cf68d754516a24d6a948b93daa5343b6152217

3 +Subject: What's cooking in git.git (Jul 2019, #03; Fri, 12)

4 +X-master-at: 9d418600f4d10dcbbfb0b5fdbc71d509e03ba719

5 +X-next-at: 5628b89657138aca6088e0c4bfa2bccdba573c6b

6

7 -What's cooking in git.git (Jul 2019, #02; Tue, 9)

7 +What's cooking in git.git (Jul 2019, #03; Fri, 12)

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

9

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

@@ -20,519 +20,145 @@ of the repositories listed at

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

21 [Graduated to "master"]

22

23 -* ab/fail-prereqs-in-test (2019-06-21) 1 commit

24 - (merged to 'next' on 2019-06-27 at 4df04aa1a0)

25 - + tests: mark two failing tests under FAIL_PREREQS

26 -

27 - Test updates.

28 -

29 -

30 -* am/p4-branches-excludes (2019-04-02) 8 commits

31 - (merged to 'next' on 2019-06-27 at 5b4fb87c45)

32 - + git-p4: respect excluded paths when detecting branches

33 - + git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"

34 - + git-p4: don't exclude other files with same prefix

35 - + git-p4: add failing test for "don't exclude other files with same prefix"

36 - + git-p4: don't groom exclude path list on every commit

37 - + git-p4: match branches case insensitively if configured

38 - + git-p4: add failing test for "git-p4: match branches case insensitively if configured"

39 - + git-p4: detect/prevent infinite loop in gitCommitByP4Change()

40 -

41 - "git p4" update.

42 -

43 -

44 -* cb/fsmonitor-intfix (2019-06-17) 1 commit

45 - (merged to 'next' on 2019-06-26 at bed7c7e78b)

46 - + fsmonitor: avoid signed integer overflow / infinite loop

47 -

48 - Variable type fix.

49 -

50 -

51 -* cb/mkstemps-uint-type-fix (2019-06-19) 1 commit

52 - (merged to 'next' on 2019-06-26 at df44db4a69)

53 - + wrapper: avoid undefined behaviour in macOS

23 +* cb/windows-manifest (2019-06-27) 1 commit

24 + (merged to 'next' on 2019-07-03 at 875721bdc9)

25 + + mingw: embed a manifest to trick UAC into Doing The Right Thing

26

55 - Variable type fix.

27 + Windows update.

28

29

58 -* cc/first-contrib-tutorial (2019-06-24) 1 commit

59 - (merged to 'next' on 2019-06-27 at a9f2ab2f21)

60 - + doc: improve usage string in MyFirstContribution

30 +* dr/progress-i18n (2019-07-02) 1 commit

31 + (merged to 'next' on 2019-07-09 at 1fe05d45de)

32 + + l10n: localizable upload progress messages

33

62 - Update docs used in a tutorial.

34 + Progress messages have been made localizable.

35

36

65 -* dl/config-alias-doc (2019-06-06) 2 commits

66 - (merged to 'next' on 2019-06-26 at 3776902022)

67 - + config/alias.txt: document alias accepting non-command first word

68 - + config/alias.txt: change " and ' to `

37 +* js/mingw-gcc-stack-protect (2019-06-27) 1 commit

38 + (merged to 'next' on 2019-07-03 at 7e3185f69d)

39 + + mingw: enable stack smashing protector

40

70 - Doc update.

41 + Windows update.

42

43

73 -* dl/includeif-onbranch (2019-06-05) 1 commit

74 - (merged to 'next' on 2019-06-27 at ef7250bbae)

75 - + config: learn the "onbranch:" includeIf condition

76 -

77 - The conditional inclusion mechanism learned to base the choice on

78 - the branch the HEAD currently is on.

79 -

80 -

81 -* ds/close-object-store (2019-06-12) 3 commits

82 - (merged to 'next' on 2019-06-26 at 86b60f2631)

83 - + packfile: rename close_all_packs to close_object_store

84 - + packfile: close commit-graph in close_all_packs

85 - + commit-graph: use raw_object_store when closing

86 - (this branch is used by ds/commit-graph-incremental; uses ds/commit-graph-write-refactor.)

87 -

88 - The commit-graph file is now part of the "files that the runtime

89 - may keep open file descriptors on, all of which would need to be

90 - closed when done with the object store", and the file descriptor to

91 - an existing commit-graph file now is closed before "gc" finalizes a

92 - new instance to replace it.

93 -

94 -

95 -* ds/commit-graph-write-refactor (2019-06-12) 11 commits

96 - (merged to 'next' on 2019-06-26 at 5430eafe51)

97 - + commit-graph: extract write_commit_graph_file()

98 - + commit-graph: extract copy_oids_to_commits()

99 - + commit-graph: extract count_distinct_commits()

100 - + commit-graph: extract fill_oids_from_all_packs()

101 - + commit-graph: extract fill_oids_from_commit_hex()

102 - + commit-graph: extract fill_oids_from_packs()

103 - + commit-graph: create write_commit_graph_context

104 - + commit-graph: remove Future Work section

105 - + commit-graph: collapse parameters into flags

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

107 - + commit-graph: fix the_repository reference

108 - (this branch is used by ds/close-object-store and ds/commit-graph-incremental.)

109 -

110 - Renamed from commit-graph-format-v2 and changed scope.

111 -

112 -

113 -* ds/fetch-disable-force-notice (2019-06-21) 3 commits

114 - (merged to 'next' on 2019-06-27 at 3ff4516f85)

115 - + pull: add --[no-]show-forced-updates passthrough

116 - + fetch: warn about forced updates in branch listing

117 - + fetch: add --[no-]show-forced-updates argument

118 -

119 - "git fetch" and "git pull" reports when a fetch results in

120 - non-fast-forward updates to let the user notice unusual situation.

121 - The commands learned "--no-shown-forced-updates" option to disable

122 - this safety feature.

123 -

124 -

125 -* es/rev-list-no-object-names (2019-06-20) 1 commit

126 - (merged to 'next' on 2019-06-27 at 6d95228e01)

127 - + rev-list: teach --no-object-names to enable piping

128 -

129 - "git rev-list --objects" learned with "--no-object-names" option to

130 - squelch the path to the object that is used as a grouping hint for

131 - pack-objects.

132 -

133 -

134 -* fc/fetch-with-import-fix (2019-06-04) 5 commits

135 - (merged to 'next' on 2019-06-26 at b7e7f359a9)

136 - + fetch: fix regression with transport helpers

137 - + fetch: make the code more understandable

138 - + fetch: trivial cleanup

139 - + t5801 (remote-helpers): add test to fetch tags

140 - + t5801 (remote-helpers): cleanup refspec stuff

141 -

142 - Code restructuring during 2.20 period broke fetching tags via

143 - "import" based transports.

144 -

145 -

146 -* jh/msvc (2019-06-25) 20 commits

147 - (merged to 'next' on 2019-06-27 at 5a16e3d67c)

148 - + msvc: ignore .dll and incremental compile output

149 - + msvc: avoid debug assertion windows in Debug Mode

150 - + msvc: do not pretend to support all signals

151 - + msvc: add pragmas for common warnings

152 - + msvc: add a compile-time flag to allow detailed heap debugging

153 - + msvc: support building Git using MS Visual C++

154 - + msvc: update Makefile to allow for spaces in the compiler path

155 - + msvc: fix detect_msys_tty()

156 - + msvc: define ftello()

157 - + msvc: do not re-declare the timespec struct

158 - + msvc: mark a variable as non-const

159 - + msvc: define O_ACCMODE

160 - + msvc: include sigset_t definition

161 - + msvc: fix dependencies of compat/msvc.c

162 - + mingw: replace mingw_startup() hack

163 - + obstack: fix compiler warning

164 - + cache-tree/blame: avoid reusing the DEBUG constant

165 - + t0001 (mingw): do not expect a specific order of stdout/stderr

166 - + Mark .bat files as requiring CR/LF endings

167 - + mingw: fix a typo in the msysGit-specific section

44 +* js/mingw-use-utf8 (2019-07-08) 3 commits

45 + (merged to 'next' on 2019-07-09 at f6a9349604)

46 + + mingw: fix possible buffer overrun when calling `GetUserNameW()`

47 + (merged to 'next' on 2019-07-03 at f528daf88d)

48 + + mingw: use Unicode functions explicitly

49 + + mingw: get pw_name in UTF-8 format

50

169 - Support to build with MSVC has been updated.

51 + Windows update.

52

53

172 -* jh/status-aheadbehind (2019-06-21) 3 commits

173 - (merged to 'next' on 2019-06-27 at 362ee6b059)

174 - + status: ignore status.aheadbehind in porcelain formats

175 - + status: warn when a/b calculation takes too long

176 - + status: add status.aheadbehind setting

177 -

178 - "git status" can be told a non-standard default value for the

179 - "--[no-]ahead-behind" option with a new configuration variable

180 - status.aheadBehind.

181 -

182 -

183 -* jk/delta-islands-progress-fix (2019-06-20) 1 commit

184 - (merged to 'next' on 2019-06-27 at 644526ba73)

185 - + delta-islands: respect progress flag

186 -

187 - The codepath to compute delta islands used to spew progress output

188 - without giving the callers any way to squelch it, which has been

189 - fixed.

190 -

191 -

192 -* jk/oidhash (2019-06-20) 17 commits

193 - (merged to 'next' on 2019-06-27 at 7bf6b87738)

194 - + hashmap: convert sha1hash() to oidhash()

195 - + hash.h: move object_id definition from cache.h

196 - + khash: rename oid helper functions

197 - + khash: drop sha1-specific map types

198 - + pack-bitmap: convert khash_sha1 maps into kh_oid_map

199 - + delta-islands: convert island_marks khash to use oids

200 - + khash: rename kh_oid_t to kh_oid_set

201 - + khash: drop broken oid_map typedef

202 - + object: convert create_object() to use object_id

203 - + object: convert internal hash_obj() to object_id

204 - + object: convert lookup_object() to use object_id

205 - + object: convert lookup_unknown_object() to use object_id

206 - + pack-objects: convert locate_object_entry_hash() to object_id

207 - + pack-objects: convert packlist_find() to use object_id

208 - + pack-bitmap-write: convert some helpers to use object_id

209 - + upload-pack: rename a "sha1" variable to "oid"

210 - + describe: fix accidental oid/hash type-punning

54 +* js/rebase-reschedule-applies-only-to-interactive (2019-07-01) 1 commit

55 + (merged to 'next' on 2019-07-09 at a13c7444c5)

56 + + rebase --am: ignore rebase.rescheduleFailedExec

57

212 - Code clean-up to remove hardcoded SHA-1 hash from many places.

213 -

214 -

215 -* jk/trailers-use-config (2019-06-19) 1 commit

216 - (merged to 'next' on 2019-06-26 at 1ba8a7c2dd)

217 - + interpret-trailers: load default config

58 + The configuration variable rebase.rescheduleFailedExec should be

59 + effective only while running an interactive rebase and should not

60 + affect anything when running an non-interactive one, which was not

61 + the case. This has been corrected.

62

219 - "git interpret-trailers" always treated '#' as the comment

220 - character, regardless of core.commentChar setting, which has been

221 - corrected.

63

64 +* jt/t5551-test-chunked (2019-06-27) 1 commit

65 + (merged to 'next' on 2019-07-03 at aafd74451c)

66 + + t5551: test usage of chunked encoding explicitly

67

224 -* js/gcc-8-and-9 (2019-06-13) 4 commits

225 - (merged to 'next' on 2019-06-27 at 92bb0db3c7)

226 - + config: avoid calling `labs()` on too-large data type

227 - + winansi: simplify loading the GetCurrentConsoleFontEx() function

228 - + kwset: allow building with GCC 8

229 - + poll (mingw): allow compiling with GCC 8 and DEVELOPER=1

230 - (this branch is used by rs/config-unit-parsing.)

68 + Update smart-http test.

69

232 - Code clean-up for new compilers.

233 - The 'kwset' one may get a wholesale replacement, either with new

234 - version of kwset from upstream or removal of its users, but in the

235 - meantime, it is probably OK to merge it down.

236 -

237 -

238 -* js/mergetool-optim (2019-06-12) 4 commits

239 - (merged to 'next' on 2019-06-26 at 8ad650bfa8)

240 - + mergetool: use shell variable magic instead of `awk`

241 - + mergetool: dissect strings with shell variable magic instead of `expr`

242 - + t7610-mergetool: use test_cmp instead of test $(cat file) = $txt

243 - + t7610-mergetool: do not place pipelines headed by `yes` in subshells

70

245 - "git mergetool" and its tests now spawn fewer subprocesses.

246 -

247 -

248 -* js/t0001-case-insensitive (2019-06-24) 1 commit

249 - (merged to 'next' on 2019-06-27 at 6c0001aebb)

250 - + t0001: fix on case-insensitive filesystems

71 +* kb/windows-force-utf8 (2019-07-03) 1 commit

72 + (merged to 'next' on 2019-07-09 at 19dfe81d85)

73 + + gettext: always use UTF-8 on native Windows

74

252 - Test update.

75 + Windows update.

76

77

255 -* js/t3404-typofix (2019-06-14) 1 commit

256 - (merged to 'next' on 2019-06-26 at ba3fcc1fc1)

257 - + t3404: fix a typo

78 +* qn/clone-doc-use-long-form (2019-07-02) 2 commits

79 + (merged to 'next' on 2019-07-09 at b2e1880627)

80 + + docs: git-clone: list short form of options first

81 + + docs: git-clone: refer to long form of options

82

259 - Typofix.

83 + The "git clone" documentation refers to command line options in its

84 + description in the short form; they have been replaced with long

85 + forms to make them more recognisable.

86

87

262 -* jw/gitweb-sample-update (2019-06-24) 1 commit

263 - (merged to 'next' on 2019-06-27 at 30a5e91e76)

264 - + doc: don't use git.kernel.org as example gitweb URL

88 +* sg/ci-brew-gcc-workaround (2019-07-08) 3 commits

89 + (merged to 'next' on 2019-07-09 at a1b3e98f0c)

90 + + ci/lib.sh: update a comment about installed P4 and Git-LFS versions

91 + (merged to 'next' on 2019-07-03 at 264f2c817a)

92 + + ci: disable Homebrew's auto cleanup

93 + + ci: don't update Homebrew

94

266 - Doc update.

95 + Dev support update.

96

97

269 -* md/sort-detached-head-first (2019-06-19) 1 commit

270 - (merged to 'next' on 2019-06-27 at dc50dbe045)

271 - + ref-filter: sort detached HEAD lines firstly

272 -

273 - "git branch --list" learned to always output the detached HEAD as

274 - the first item (when the HEAD is detached, of course), regardless

275 - of the locale.

276 -

277 -

278 -* mo/hpux-dynpath (2019-06-07) 1 commit

279 - (merged to 'next' on 2019-06-26 at 5add3b28b2)

280 - + configure: Detect linking style for HP aCC on HP-UX

281 -

282 - Auto-detect how to tell HP-UX aCC where to use dynamically linked

283 - libraries from at runtime.

284 -

285 -

286 -* ms/submodule-foreach-fix (2019-06-25) 1 commit

287 - (merged to 'next' on 2019-06-27 at ccd37d4dac)

288 - + submodule foreach: fix recursion of options

289 -

290 - "git submodule foreach" did not protect command line options passed

291 - to the command to be run in each submodule correctly, when the

292 - "--recursive" option was in use.

293 -

294 -

295 -* nb/branch-show-other-worktrees-head (2019-05-07) 3 commits

296 - (merged to 'next' on 2019-06-26 at ae3b7a626d)

297 - + branch: add worktree info on verbose output

298 - + branch: update output to include worktree info

299 - + ref-filter: add worktreepath atom

300 -

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

302 - in other worktrees connected to the same repository prefixed with

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

304 - with '*' in front.

305 -

306 -

307 -* nd/completion-no-cache-failure (2019-06-12) 1 commit

308 - (merged to 'next' on 2019-06-26 at f7b5a0a622)

309 - + completion: do not cache if --git-completion-helper fails

310 -

311 - An incorrect list of options was cached after command line

312 - completion failed (e.g. trying to complete a command that requires

313 - a repository outside one), which has been corrected.

314 -

315 -

316 -* nd/fetch-capability-tweak (2019-06-20) 3 commits

317 - (merged to 'next' on 2019-06-27 at dedbcb31a1)

318 - + fetch-pack: print server version at the top in -v -v

319 - + fetch-pack: print all relevant supported capabilities with -v -v

320 - + fetch-pack: move capability names out of i18n strings

321 -

322 - Protocol capabilities that go over wire should never be translated,

323 - but it was incorrectly marked for translation, which has been

324 - corrected. The output of protocol capabilities for debugging has

325 - been tweaked a bit.

326 -

327 -

328 -* nd/fetch-multi-gc-once (2019-06-19) 1 commit

329 - (merged to 'next' on 2019-06-27 at 0225ada5e2)

330 - + fetch: only run 'gc' once when fetching multiple remotes

331 -

332 - "git fetch" that grabs from a group of remotes learned to run the

333 - auto-gc only once at the very end.

334 -

335 -

336 -* nd/switch-and-restore (2019-06-20) 46 commits

337 - (merged to 'next' on 2019-06-27 at 85f83ad8d6)

338 - + completion: disable dwim on "git switch -d"

339 - + switch: allow to switch in the middle of bisect

340 - + t2027: use test_must_be_empty

341 - + Declare both git-switch and git-restore experimental

342 - + help: move git-diff and git-reset to different groups

343 - + doc: promote "git restore"

344 - + user-manual.txt: prefer 'merge --abort' over 'reset --hard'

345 - + completion: support restore

346 - + t: add tests for restore

347 - + restore: support --patch

348 - + restore: replace --force with --ignore-unmerged

349 - + restore: default to --source=HEAD when only --staged is specified

350 - + restore: reject invalid combinations with --staged

351 - + restore: add --worktree and --staged

352 - + checkout: factor out worktree checkout code

353 - + restore: disable overlay mode by default

354 - + restore: make pathspec mandatory

355 - + restore: take tree-ish from --source option instead

356 - + checkout: split part of it to new command 'restore'

357 - + doc: promote "git switch"

358 - + completion: support switch

359 - + t: add tests for switch

360 - + switch: make --orphan switch to an empty tree

361 - + switch: reject if some operation is in progress

362 - + switch: no worktree status unless real branch switch happens

363 - + switch: implicit dwim, use --no-guess to disable it

364 - + switch: add short option for --detach

365 - + switch: only allow explicit detached HEAD

366 - + switch: reject "do nothing" case

367 - + switch: stop accepting pathspec

368 - + switch: remove -l

369 - + switch: add --discard-changes

370 - + switch: better names for -b and -B

371 - + checkout: split part of it to new command 'switch'

372 - + checkout: split options[] array in three pieces

373 - + checkout: move 'confict_style' and 'dwim_..' to checkout_opts

374 - + checkout: make "opts" in cmd_checkout() a pointer

375 - + checkout: factor out some code in parse_branchname_arg()

376 - + checkout: keep most #include sorted

377 - + checkout: inform the user when removing branch state

378 - + checkout: advice how to get out of detached HEAD mode

379 - + t: rename t2014-switch.sh to t2014-checkout-switch.sh

380 - + git-checkout.txt: fix monospace typeset

381 - + doc: document --overwrite-ignore

382 - + git-checkout.txt: fix one syntax line

383 - + git-checkout.txt: spell out --no-option

384 - (this branch is used by jl/status-reduce-vertical-blank.)

385 -

386 - Two new commands "git switch" and "git restore" are introduced to

387 - split "checking out a branch to work on advancing its history" and

388 - "checking out paths out of the index and/or a tree-ish to work on

389 - advancing the current history" out of the single "git checkout"

390 - command.

391 -

392 -

393 -* po/doc-branch (2019-05-29) 1 commit

394 - (merged to 'next' on 2019-06-26 at 0debcb13e5)

395 - + doc branch: provide examples for listing remote tracking branches

98 +* sg/git-C-empty-doc (2019-07-01) 1 commit

99 + (merged to 'next' on 2019-07-09 at 351952f80f)

100 + + Document that 'git -C ""' works and doesn't change directory

101

102 Doc update.

103

104 +--------------------------------------------------

105 +[New Topics]

106

400 -* pw/add-p-recount (2019-06-13) 1 commit

401 - (merged to 'next' on 2019-06-26 at 63e063d65d)

402 - + add -p: fix checkout -p with pathological context

403 -

404 - "git checkout -p" needs to selectively apply a patch in reverse,

405 - which did not work well.

406 -

407 -

408 -* pw/doc-synopsis-markup-opmode-options (2019-06-17) 1 commit

409 - (merged to 'next' on 2019-06-26 at 4258eddd2d)

410 - + show --continue/skip etc. consistently in synopsis

411 -

412 - Docfix.

413 -

414 -

415 -* pw/rebase-abort-clean-rewritten (2019-05-15) 4 commits

416 - (merged to 'next' on 2019-06-27 at 97c9f12c4d)

417 - + rebase --abort/--quit: cleanup refs/rewritten

418 - + sequencer: return errors from sequencer_remove_state()

419 - + rebase: warn if state directory cannot be removed

420 - + rebase: fix a memory leak

421 -

422 - "git rebase --abort" used to leave refs/rewritten/ when concluding

423 - "git rebase -r", which has been corrected.

424 -

425 -

426 -* rs/avoid-overflow-in-midpoint-computation (2019-06-13) 1 commit

427 - (merged to 'next' on 2019-06-26 at e6bd5b496b)

428 - + cleanup: fix possible overflow errors in binary search, part 2

429 -

430 - Code clean-up to avoid signed integer overlaps during binary search.

431 -

432 -

433 -* rs/config-unit-parsing (2019-06-24) 3 commits

434 - (merged to 'next' on 2019-06-27 at db633f85fe)

435 - + config: simplify parsing of unit factors

436 - + config: don't multiply in parse_unit_factor()

437 - + config: use unsigned_mult_overflows to check for overflows

438 - (this branch uses js/gcc-8-and-9.)

439 -

440 - The code to parse scaled numbers out of configuration files has

441 - been made more robust and also easier to follow.

442 -

443 -

444 -* rs/copy-array (2019-06-17) 2 commits

445 - (merged to 'next' on 2019-06-26 at dfaa162f88)

446 - + use COPY_ARRAY for copying arrays

447 - + coccinelle: use COPY_ARRAY for copying arrays

448 -

449 - Code clean-up.

450 -

451 -

452 -* sg/rebase-progress (2019-06-27) 5 commits

453 - (merged to 'next' on 2019-06-27 at 425dd45c81)

454 - + progress: use term_clear_line()

455 - + rebase: fix garbled progress display with '-x'

456 - + pager: add a helper function to clear the last line in the terminal

457 - + t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused

458 - + t3404: modernize here doc style

459 - (this branch is used by pw/rebase-progress-test-cleanup.)

460 -

461 - Use "Erase in Line" CSI sequence that is already used in the editor

462 - support to clear cruft in the progress output.

463 -

464 -

465 -* sg/t5551-fetch-smart-error-is-translated (2019-06-25) 1 commit

466 - (merged to 'next' on 2019-06-27 at 967c03da24)

467 - + t5551: use 'test_i18ngrep' to check translated output

468 -

469 - Test update.

470 -

471 -

472 -* sg/trace2-rename (2019-06-27) 2 commits

473 - (merged to 'next' on 2019-06-27 at 6e189bdb20)

474 - + trace2: correct typo in technical documentation

475 - (merged to 'next' on 2019-06-26 at 8ee228c455)

476 - + Revert "test-lib: whitelist GIT_TR2_* in the environment"

107 +* js/trace2-signo-typofix (2019-07-09) 1 commit

108 + (merged to 'next' on 2019-07-11 at b2d2029b90)

109 + + trace2: correct trace2 field name documentation

110

478 - Dev support update to help tracing out tests.

111 + Documentation fix.

112

113 + Will merge to 'master'.

114

481 -* tg/stash-ref-by-index-fix (2019-06-19) 1 commit

482 - (merged to 'next' on 2019-06-26 at ee2e6308ae)

483 - + stash: fix show referencing stash index

115

485 - "git stash show 23" used to work, but no more after getting

486 - rewritten in C; this regression has been corrected.

116 +* ma/ref-filter-leakfix (2019-07-10) 1 commit

117 + (merged to 'next' on 2019-07-11 at a7a4bb81ac)

118 + + ref-filter: fix memory leak in `free_array_item()`

119

120 + Leakfix.

121

489 -* tm/tag-gpgsign-config (2019-06-05) 1 commit

490 - (merged to 'next' on 2019-06-26 at 015709def5)

491 - + tag: add tag.gpgSign config option to force all tags be GPG-signed

122 + Will merge to 'master'.

123

493 - A new tag.gpgSign configuration variable turns "git tag -a" into

494 - "git tag -s".

124

496 ---------------------------------------------------

497 -[New Topics]

125 +* js/unmap-before-ext-diff (2019-07-11) 1 commit

126 + - diff: munmap() file contents before running external diff

127

499 -* ea/merge-code-cleanup (2019-07-09) 1 commit

500 - - builtin/merge.c - cleanup of code in for-cycle that tests strategies

501 -

502 - A loop has been rewritten for conciseness and clarity.

128 + Windows update.

129

130 Will merge to 'next'.

131

132

507 -* kb/mingw-set-home (2019-07-08) 1 commit

508 - - mingw: initialize HOME on startup

133 +* rm/gpg-program-doc-fix (2019-07-12) 1 commit

134 + - gpg(docs): use correct --verify syntax

135

510 - Windows port update.

136 + Docfix.

137

138 Will merge to 'next'.

139

140 +--------------------------------------------------

141 +[Stalled]

142

515 -* tg/range-diff-output-update (2019-07-09) 14 commits

516 - - range-diff: add headers to the outer hunk header

517 - - range-diff: add filename to inner diff

518 - - range-diff: add section header instead of diff header

519 - - range-diff: suppress line count in outer diff

520 - - range-diff: don't remove funcname from inner diff

521 - - range-diff: split lines manually

522 - - range-diff: fix function parameter indentation

523 - - apply: make parse_git_header public

524 - - apply: only pass required data to gitdiff_* functions

525 - - apply: only pass required data to find_name_*

526 - - apply: only pass required data to check_header_line

527 - - apply: only pass required data to git_header_name

528 - - apply: only pass required data to skip_tree_prefix

529 - - apply: replace marc.info link with public-inbox

143 +* nd/index-dump-in-json (2019-06-26) 11 commits

144 + - SQUASH???

145 + - t3008: use the new SINGLE_CPU prereq

146 + - read-cache.c: dump "IEOT" extension as json

147 + - read-cache.c: dump "EOIE" extension as json

148 + - resolve-undo.c: dump "REUC" extension as json

149 + - fsmonitor.c: dump "FSMN" extension as json

150 + - split-index.c: dump "link" extension as json

151 + - dir.c: dump "UNTR" extension as json

152 + - cache-tree.c: dump "TREE" extension as json

153 + - read-cache.c: dump common extension info in json

154 + - ls-files: add --json to dump the index

155

531 - "git range-diff" output has been tweaked for easier identification

532 - of which part of what file the patch shown is about.

156 + "ls-files" learned "--debug-json" option to dump the contents and

157 + the extensions of the index file.

158 +

159 + At least the fixup at the tip needs to be squashed into the right

160 + commit. Also the new test seems flaky.

161

534 ---------------------------------------------------

535 -[Stalled]

162

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

164 - index: offer advice for unknown index extensions

@@ -606,6 +232,64 @@ of the repositories listed at

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

233 [Cooking]

234

235 +* mt/dir-iterator-updates (2019-07-11) 10 commits

236 + - clone: replace strcmp by fspathcmp

237 + - clone: use dir-iterator to avoid explicit dir traversal

238 + - clone: extract function from copy_or_link_directory

239 + - clone: copy hidden paths at local clone

240 + - dir-iterator: add flags parameter to dir_iterator_begin

241 + - dir-iterator: refactor state machine model

242 + - dir-iterator: use warning_errno when possible

243 + - dir-iterator: add tests for dir-iterator API

244 + - clone: better handle symlinked files at .git/objects/

245 + - clone: test for our behavior on odd objects/* content

246 +

247 + Adjust the dir-iterator API and apply it to the local clone

248 + optimization codepath.

249 +

250 + Will merge to 'next'.

251 +

252 +

253 +* ea/merge-code-cleanup (2019-07-09) 1 commit

254 + (merged to 'next' on 2019-07-11 at a7b831b03e)

255 + + builtin/merge.c - cleanup of code in for-cycle that tests strategies

256 +

257 + A loop has been rewritten for conciseness and clarity.

258 +

259 + Will merge to 'master'.

260 +

261 +

262 +* kb/mingw-set-home (2019-07-08) 1 commit

263 + (merged to 'next' on 2019-07-11 at 51c7e23dab)

264 + + mingw: initialize HOME on startup

265 +

266 + Windows port update.

267 +

268 + Will merge to 'master'.

269 +

270 +

271 +* tg/range-diff-output-update (2019-07-11) 14 commits

272 + - range-diff: add headers to the outer hunk header

273 + - range-diff: add filename to inner diff

274 + - range-diff: add section header instead of diff header

275 + - range-diff: suppress line count in outer diff

276 + - range-diff: don't remove funcname from inner diff

277 + - range-diff: split lines manually

278 + - range-diff: fix function parameter indentation

279 + - apply: make parse_git_diff_header public

280 + - apply: only pass required data to gitdiff_* functions

281 + - apply: only pass required data to find_name_*

282 + - apply: only pass required data to check_header_line

283 + - apply: only pass required data to git_header_name

284 + - apply: only pass required data to skip_tree_prefix

285 + - apply: replace marc.info link with public-inbox

286 +

287 + "git range-diff" output has been tweaked for easier identification

288 + of which part of what file the patch shown is about.

289 +

290 + Will merge to 'next'.

291 +

292 +

293 * bc/hash-independent-tests-part-4 (2019-07-01) 10 commits

294 - t2203: avoid hard-coded object ID values

295 - t1710: make hash independent

@@ -620,6 +304,10 @@ of the repositories listed at

304

305 Update to the tests to help SHA-256 transition continues.

306

307 + Ready? After cursory scan of this series I didn't find anything

308 + glaringly wrong. Will merge to 'next' until I hear otherwise

309 + within a few days.

310 +

311

312 * pw/prompt-cherry-pick-revert-fix (2019-07-01) 1 commit

313 (merged to 'next' on 2019-07-09 at bf8f0af685)

@@ -633,24 +321,15 @@ of the repositories listed at

321

322

323 * pw/rebase-progress-test-cleanup (2019-07-08) 1 commit

636 - - t3420: remove progress lines before comparing output

324 + (merged to 'next' on 2019-07-11 at 1363de0fe2)

325 + + t3420: remove progress lines before comparing output

326

327 Test cleanup.

328

640 - Will merge to 'next'.

641 -

642 -

643 -* sg/git-C-empty-doc (2019-07-01) 1 commit

644 - (merged to 'next' on 2019-07-09 at 351952f80f)

645 - + Document that 'git -C ""' works and doesn't change directory

646 -

647 - Doc update.

648 -

329 Will merge to 'master'.

330

331

652 -* es/local-atomic-push-failure-with-http (2019-07-02) 2 commits

653 - - SQUASH???

332 +* es/local-atomic-push-failure-with-http (2019-07-12) 1 commit

333 - transport-helper: enforce atomic in push_refs_with_push

334

335 "git push --atomic" that goes over the transport-helper (namely,

@@ -658,7 +337,7 @@ of the repositories listed at

337 it can locally tell that one of the ref update will fail without

338 having to consult the other end, which has been corrected.

339

661 - Need to either wait for reroll or squash the fix in directly.

340 + Will merge to 'next'.

341

342

343 * es/walken-tutorial (2019-07-02) 1 commit

@@ -667,90 +346,6 @@ of the repositories listed at

346 Yet another revision walker tutorial.

347

348

670 -* qn/clone-doc-use-long-form (2019-07-02) 2 commits

671 - (merged to 'next' on 2019-07-09 at b2e1880627)

672 - + docs: git-clone: list short form of options first

673 - + docs: git-clone: refer to long form of options

674 -

675 - The "git clone" documentation refers to command line options in its

676 - description in the short form; they have been replaced with long

677 - forms to make them more recognisable.

678 -

679 - Will merge to 'master'.

680 -

681 -

682 -* sg/ci-brew-gcc-workaround (2019-07-08) 3 commits

683 - (merged to 'next' on 2019-07-09 at a1b3e98f0c)

684 - + ci/lib.sh: update a comment about installed P4 and Git-LFS versions

685 - (merged to 'next' on 2019-07-03 at 264f2c817a)

686 - + ci: disable Homebrew's auto cleanup

687 - + ci: don't update Homebrew

688 -

689 - Dev support update.

690 -

691 - Will merge to 'master'.

692 -

693 -

694 -* cb/windows-manifest (2019-06-27) 1 commit

695 - (merged to 'next' on 2019-07-03 at 875721bdc9)

696 - + mingw: embed a manifest to trick UAC into Doing The Right Thing

697 -

698 - Windows update.

699 -

700 - Will merge to 'master'.

701 -

702 -

703 -* js/mingw-gcc-stack-protect (2019-06-27) 1 commit

704 - (merged to 'next' on 2019-07-03 at 7e3185f69d)

705 - + mingw: enable stack smashing protector

706 -

707 - Windows update.

708 -

709 - Will merge to 'master'.

710 -

711 -

712 -* js/mingw-use-utf8 (2019-07-08) 3 commits

713 - (merged to 'next' on 2019-07-09 at f6a9349604)

714 - + mingw: fix possible buffer overrun when calling `GetUserNameW()`

715 - (merged to 'next' on 2019-07-03 at f528daf88d)

716 - + mingw: use Unicode functions explicitly

717 - + mingw: get pw_name in UTF-8 format

718 -

719 - Windows update.

720 -

721 - Will merge to 'master'.

722 -

723 -

724 -* kb/windows-force-utf8 (2019-07-03) 1 commit

725 - (merged to 'next' on 2019-07-09 at 19dfe81d85)

726 - + gettext: always use UTF-8 on native Windows

727 -

728 - Windows update.

729 -

730 - Will merge to 'master'.

731 -

732 -

733 -* js/rebase-reschedule-applies-only-to-interactive (2019-07-01) 1 commit

734 - (merged to 'next' on 2019-07-09 at a13c7444c5)

735 - + rebase --am: ignore rebase.rescheduleFailedExec

736 -

737 - The configuration variable rebase.rescheduleFailedExec should be

738 - effective only while running an interactive rebase and should not

739 - affect anything when running an non-interactive one, which was not

740 - the case. This has been corrected.

741 -

742 - Will merge to 'master'.

743 -

744 -

745 -* jt/t5551-test-chunked (2019-06-27) 1 commit

746 - (merged to 'next' on 2019-07-03 at aafd74451c)

747 - + t5551: test usage of chunked encoding explicitly

748 -

749 - Update smart-http test.

750 -

751 - Will merge to 'master'.

752 -

753 -

349 * tb/ref-filter-multiple-patterns (2019-06-27) 1 commit

350 (merged to 'next' on 2019-07-03 at f59ad42c4a)

351 + ref-filter.c: find disjoint pattern prefixes

@@ -798,7 +393,8 @@ of the repositories listed at

393 I think I spotted one unused command, which we may want to remove, though.

394

395

801 -* ab/test-env (2019-06-21) 8 commits

396 +* ab/test-env (2019-07-11) 9 commits

397 + - env--helper: mark a file-local symbol as static

398 (merged to 'next' on 2019-07-09 at 096658f382)

399 + tests: make GIT_TEST_FAIL_PREREQS a boolean

400 + tests: replace test_tristate with "git env--helper"

@@ -815,7 +411,7 @@ of the repositories listed at

411 ways to spell true, like yes, on, etc., and also ways to spell

412 false, like no, off, etc." convention.

413

818 - Will merge to 'master'.

414 + Will merge to 'next'.

415

416

417 * ds/early-access (2019-07-01) 3 commits

@@ -830,35 +426,6 @@ of the repositories listed at

426 adoption" mindset may not match diverse use cases of the tool.

427

428

833 -* nd/index-dump-in-json (2019-06-26) 11 commits

834 - - SQUASH???

835 - - t3008: use the new SINGLE_CPU prereq

836 - - read-cache.c: dump "IEOT" extension as json

837 - - read-cache.c: dump "EOIE" extension as json

838 - - resolve-undo.c: dump "REUC" extension as json

839 - - fsmonitor.c: dump "FSMN" extension as json

840 - - split-index.c: dump "link" extension as json

841 - - dir.c: dump "UNTR" extension as json

842 - - cache-tree.c: dump "TREE" extension as json

843 - - read-cache.c: dump common extension info in json

844 - - ls-files: add --json to dump the index

845 -

846 - "ls-files" learned "--debug-json" option to dump the contents and

847 - the extensions of the index file.

848 -

849 - At least the fixup at the tip needs to be squashed into the right

850 - commit. Also the new test seems flaky.

851 -

852 -

853 -* dr/progress-i18n (2019-07-02) 1 commit

854 - (merged to 'next' on 2019-07-09 at 1fe05d45de)

855 - + l10n: localizable upload progress messages

856 -

857 - Progress messages have been made localizable.

858 -

859 - Will merge to 'master'.

860 -

861 -

429 * pw/status-with-corrupt-sequencer-state (2019-06-27) 3 commits

430 (merged to 'next' on 2019-07-03 at 273aee6b3c)

431 + status: do not report errors in sequencer/todo

@@ -890,24 +457,6 @@ of the repositories listed at

457 Will merge to 'next'.

458

459

893 -* mt/dir-iterator-updates (2019-06-25) 10 commits

894 - - clone: replace strcmp by fspathcmp

895 - - clone: use dir-iterator to avoid explicit dir traversal

896 - - clone: extract function from copy_or_link_directory

897 - - clone: copy hidden paths at local clone

898 - - dir-iterator: add flags parameter to dir_iterator_begin

899 - - dir-iterator: refactor state machine model

900 - - dir-iterator: use warning_errno when possible

901 - - dir-iterator: add tests for dir-iterator API

902 - - clone: better handle symlinked files at .git/objects/

903 - - clone: test for our behavior on odd objects/* content

904 -

905 - Adjust the dir-iterator API and apply it to the local clone

906 - optimization codepath.

907 -

908 - Is this ready for 'next'?

909 -

910 -

460 * nd/tree-walk-with-repo (2019-06-28) 7 commits

461 (merged to 'next' on 2019-07-09 at 3e613f977c)

462 + t7814: do not generate same commits in different repos

@@ -1012,11 +561,12 @@ of the repositories listed at

561

562

563 * jl/status-reduce-vertical-blank (2019-06-21) 1 commit

1015 - - status: remove the empty line after hints

564 + (merged to 'next' on 2019-07-11 at 5716f37348)

565 + + status: remove the empty line after hints

566

567 Extra blank lines in "git status" output have been reduced.

568

1019 - Needs to wait on nd/switch-and-restore to stabilize.

569 + Will merge to 'master'.

570

571

572 * ds/commit-graph-incremental (2019-06-19) 18 commits

What's cooking (2019/07 #03)