a1aa6239bc · 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 (May 2017, #01; Mon, 1)

4 -X-master-at: d2bbb7c2bcf6e77ebfcabf4e12110fe6d5c91de6

5 -X-next-at: 07d810a77faeacef1f1f4c78e6e47457d65ebbe0

3 +Subject: What's cooking in git.git (May 2017, #02; Mon, 8)

4 +X-master-at: 4fa66c85f11bc5a541462ca5ae3246aa0ce02e74

5 +X-next-at: 57267f22770ebcdb20d119053d99e73c84a1c8da

6

7 -What's cooking in git.git (May 2017, #01; Mon, 1)

7 +What's cooking in git.git (May 2017, #02; Mon, 8)

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

9

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

@@ -12,12 +12,6 @@ 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 -2.13-rc1 was tagged and we are now in a pre-release freeze. The

16 -topics marked to be merged to 'next' in the list below may be merged

17 -to 'next' as usual, but the ones marked for 'master' may stay in

18 -'next' until the final release, unless they are small bug/doc fixes

19 -or hotfixes to topics that are already in -rc1 from now on.

20 -

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

16 of the repositories listed at

17

@@ -26,190 +20,179 @@ of the repositories listed at

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

21 [Graduated to "master"]

22

29 -* ab/align-perf-descriptions (2017-04-23) 1 commit

30 - (merged to 'next' on 2017-04-26 at 7d66e7019e)

31 - + t/perf: correctly align non-ASCII descriptions in output

32 -

33 - Output from perf tests have been updated to align their titles.

34 -

35 -

36 -* jk/complete-checkout-sans-dwim-remote (2017-04-23) 1 commit

37 - (merged to 'next' on 2017-04-26 at 0c69cff69f)

38 - + completion: optionally disable checkout DWIM

39 -

40 - Completion for "git checkout <branch>" that auto-creates the branch

41 - out of a remote tracking branch can now be disabled, as this

42 - completion often gets in the way when completing to checkout an

43 - existing local branch that happens to share the same prefix with

44 - bunch of remote tracking branches.

45 -

46 -

47 -* jk/prio-queue-avoid-swap-with-self (2017-04-24) 1 commit

48 - (merged to 'next' on 2017-04-26 at 6a55996734)

49 - + prio_queue_reverse: don't swap elements with themselves

50 -

51 - Code clean-up.

23 +* ja/i18n-cleanup (2017-05-01) 2 commits

24 + (merged to 'next' on 2017-04-30 at 8002e53820)

25 + + i18n: read-cache: typofix

26 + + i18n: remove i18n from tag reflog message

27

28

54 -* jk/submodule-init-segv-fix (2017-04-24) 1 commit

55 - (merged to 'next' on 2017-04-26 at 9a6eaaff89)

56 - + submodule_init: die cleanly on submodules without url defined

29 +* rg/a-the-typo (2017-05-01) 1 commit

30 + (merged to 'next' on 2017-04-30 at a648cf2961)

31 + + fix minor typos

32

58 - Fix a segv in 'submodule init' when url is not given for a submodule.

33 + Typofix.

34

35

61 -* ls/travis-stricter-linux32-builds (2017-04-27) 1 commit

62 - (merged to 'next' on 2017-04-28 at b0a56aec83)

63 - + travis-ci: set DEVELOPER knob for Linux32 build

36 +* rg/doc-pull-typofix (2017-05-01) 1 commit

37 + (merged to 'next' on 2017-04-30 at c2edb4d813)

38 + + doc: git-pull.txt use US spelling, fix minor typo

39

65 - 32-bit Linux build on Travis CI uses stricter compilation options.

40

41 +* rg/doc-submittingpatches-wordfix (2017-05-01) 1 commit

42 + (merged to 'next' on 2017-04-30 at 4065036588)

43 + + doc: update SubmittingPatches

44

68 -* ls/travis-win-fix-status (2017-04-26) 1 commit

69 - (merged to 'next' on 2017-04-28 at 5c5e4d3278)

70 - + travis-ci: printf $STATUS as string

45

72 - Relaying status from Windows build by Travis CI was done with an

73 - unsafe invocation of printf.

46 +* sr/hooks-cwd-doc (2017-05-01) 1 commit

47 + (merged to 'next' on 2017-04-30 at 063dd5cb02)

48 + + githooks.txt: clarify push hooks are always executed in $GIT_DIR

49

50 +--------------------------------------------------

51 +[New Topics]

52

76 -* sh/rebase-i-reread-todo-after-exec (2017-04-27) 1 commit

77 - (merged to 'next' on 2017-04-28 at 1ea7e62026)

78 - + rebase -i: reread the todo list if `exec` touched it

53 +* jn/clone-add-empty-config-from-command-line (2017-05-02) 1 commit

54 + - clone: handle empty config values in -c

55

80 - "git rebase -i" failed to re-read the todo list file when the

81 - command specified with the `exec` instruction updated it.

56 + "git clone --config var=val" is a way to populate the

57 + per-repository configuration file of the new repository, but it did

58 + not work well when val is an empty string. This has been fixed.

59

83 ---------------------------------------------------

84 -[New Topics]

60 + Will merge to 'next'.

61

86 -* bw/submodule-with-bs-path (2017-05-01) 1 commit

87 - - t7400: add !CYGWIN prerequisite to 'add with \\ in path'

62

89 - A hotfix to a topic that is already in 'master'.

63 +* jn/credential-doc-on-clear (2017-05-02) 1 commit

64 + - credential doc: make multiple-helper behavior more prominent

65

91 - Wait for a few days for Acks and then merge to 'master'.

66 + Doc update.

67

68 + Will merge to 'next'.

69

94 -* jk/am-leakfix (2017-04-27) 3 commits

95 - (merged to 'next' on 2017-04-30 at 78becd7a96)

96 - + am: shorten ident_split variable name in get_commit_info()

97 - + am: simplify allocations in get_commit_info()

98 - + am: fix commit buffer leak in get_commit_info()

70

100 - The codepath in "git am" that is used when running "git rebase"

101 - leaked memory held for the log message of the commits being rebased.

71 +* sb/checkout-recurse-submodules (2017-05-04) 3 commits

72 + - submodule: properly recurse for read-tree and checkout

73 + - submodule: avoid auto-discovery in new working tree manipulator code

74 + - submodule_move_head: reuse child_process structure for futher commands

75

103 - Will cook in 'next'.

76 + "git checkout --recurse-submodules" did not quite work with a

77 + submodule that itself has submodules.

78

79 + Will merge to 'next'.

80

106 -* js/plug-leaks (2017-04-27) 13 commits

107 - - checkout: fix memory leak

108 - - cat-file: fix memory leak

109 - - mailinfo & mailsplit: check for EOF while parsing mails

110 - - status: close file descriptor after reading git-rebase-todo

111 - - difftool: close file descriptors after reading

112 - - http-backend: avoid memory leaks

113 - - SQUASH???

114 - - get_mail_commit_oid(): avoid resource leak

115 - - git_config_rename_section_in_file(): avoid resource leak

116 - - add_commit_patch_id(): avoid allocating memory unnecessarily

117 - - winansi: avoid buffer overrun

118 - - winansi: avoid use of uninitialized value

119 - - mingw: avoid memory leak when splitting PATH

81

121 - An attempt to fix memory leaks pointed out by Coverity.

82 +* ab/aix-needs-compat-regex (2017-05-04) 1 commit

83 + - config.mak.uname: set NO_REGEX=NeedsStartEnd on AIX

84

123 - A reroll exists and needs to be picked up. What's queued here is

124 - just an early parts of the first iteration.

85 + Build fix.

86

87 + Will merge to 'next'.

88

127 -* sk/status-short-branch-color-config (2017-04-28) 2 commits

128 - (merged to 'next' on 2017-04-30 at 2a7eb05d7b)

129 - + status: add color config slots for branch info in "--short --branch"

130 - + status: fix missing newline when comment chars are disabled

89

132 - The colors in which "git status --short --branch" showed the names

133 - of the current branch and its remote-tracking branch are now

134 - configurable.

90 +* ja/do-not-ask-needless-questions (2017-05-04) 3 commits

91 + - git-filter-branch: make the error msg when missing branch more open

92 + - read-tree -m: make error message for merging 0 trees less smart aleck

93 + - usability: don't ask questions if no reply is required

94

136 - Will cook in 'next'.

95 + Git sometimes gives an advice in a rhetorical question that does

96 + not require an answer, which can confuse new users and non native

97 + speakers. Attempt to rephrase them.

98

99 + I lost track of the discussion on this topic. Did we decide that

100 + this is not a good idea?

101

139 -* jh/close-index-before-stat (2017-04-28) 1 commit

140 - (merged to 'next' on 2017-04-30 at 918d4f3378)

141 - + read-cache: close index.lock in do_write_index

102

143 - The timestamp of the index file is now taken after the file is

144 - closed, to help Windows, on which a stale timestamp is reported by

145 - fstat() on a file that is opened for writing and data was written

146 - but not yet closed.

103 +* ab/doc-replace-gmane-links (2017-05-08) 2 commits

104 + - SQAUSH???

105 + - doc: replace a couple of broken gmane links

106

148 - Will cook in 'next'.

107 + The Web interface to gmane news archive is long gone, even though

108 + the articles are still accessible via NTTP. Replace the links with

109 + ones to public-inbox.org. Because their message identification is

110 + based on the actual message-id, it is likely that it will be easier

111 + to migrate away from it if/when necessary.

112

113

151 -* bw/submodule-has-commits-update (2017-05-01) 6 commits

152 - - submodule: refactor logic to determine changed submodules

153 - - submodule: improve submodule_has_commits

154 - - submodule: change string_list changed_submodule_paths

155 - - submodule: remove add_oid_to_argv()

156 - - submodule: rename free_submodules_sha1s()

157 - - submodule: rename add_sha1_to_array()

114 +* ab/fix-poison-tests (2017-05-08) 3 commits

115 + - travis-ci: add job to run tests with GETTEXT_POISON

116 + - travis-ci: setup "prove cache" in "script" step

117 + - tests: fix tests broken under GETTEXT_POISON=YesPlease

118

119 + Update tests to pass under GETTEXT_POISON (a mechanism to ensure

120 + that output strings that should not be translated are not

121 + translated by mistake), and tell TravisCI to run them.

122

160 -* ja/i18n-cleanup (2017-05-01) 2 commits

161 - (merged to 'next' on 2017-04-30 at 8002e53820)

162 - + i18n: read-cache: typofix

163 - + i18n: remove i18n from tag reflog message

123 + Will merge to 'next' after a few rounds on 'pu'.

124

165 - Will merge to 'master'.

125

126 +* bw/dir-c-stops-relying-on-the-index (2017-05-06) 14 commits

127 + - dir: convert fill_directory to take an index

128 + - dir: convert read_directory to take an index

129 + - dir: convert read_directory_recursive to take an index

130 + - dir: convert open_cached_dir to take an index

131 + - dir: convert is_excluded to take an index

132 + - dir: convert prep_exclude to take an index

133 + - dir: convert add_excludes to take an index

134 + - dir: convert is_excluded_from_list to take an index

135 + - dir: convert last_exclude_matching_from_list to take an index

136 + - dir: convert dir_add* to take an index

137 + - dir: convert get_dtype to take index

138 + - dir: convert directory_exists_in_index to take index

139 + - dir: convert read_skip_worktree_file_from_index to take an index

140 + - dir: stop using the index compatibility macros

141

168 -* ls/travis-relays-for-windows-ci (2017-05-01) 2 commits

169 - - travis-ci: handle Git for Windows CI status "failed" explicitly

170 - - travis-ci: retry if Git for Windows CI returns HTTP error 502 or 503

142 + API update.

143

172 - Will merge to 'next' after a few CI run in 'pu'.

144 + Will merge to 'next'.

145

146

175 -* mb/diff-default-to-indent-heuristics (2017-05-01) 5 commits

176 - - add--interactive: drop diff.indentHeuristic handling

177 - - SQUASH

178 - - diff: enable indent heuristic by default

179 - - diff: have the diff-* builtins configure diff before initializing revisions

180 - - diff: make the indent heuristic part of diff's basic configuration

147 +* jk/diff-submodule-diff-inline (2017-05-08) 1 commit

148 + - diff: recurse into nested submodules for inline diff

149

182 - Make the "indent" heuristics the default in "diff" and diff.indentHeuristics

183 - configuration variable an escape hatch for those who do no want it.

150 + "git diff --submodule=diff" didn't recurse into nested submodules.

151

185 - The fix-up needs to be squashed in.

152

153 +* jk/disable-pack-reuse-when-broken (2017-05-08) 1 commit

154 + - pack-objects: disable pack reuse for object-selection options

155

188 -* rg/doc-pull-typofix (2017-05-01) 1 commit

189 - (merged to 'next' on 2017-04-30 at c2edb4d813)

190 - + doc: git-pull.txt use US spelling, fix minor typo

156 + "pack-objects" can stream a slice of an existing packfile out when

157 + the pack bitmap can tell that the reachable objects are all needed

158 + in the output, without inspecting individual objects. This

159 + strategy however would not work well when "--local" and other

160 + options are in use, and need to be disabled.

161

192 - Will merge to 'master'.

162

163 +* js/eol-on-ourselves (2017-05-08) 7 commits

164 + - t4051: mark supporting files as requiring LF-only line endings

165 + - Fix the remaining tests that failed with core.autocrlf=true

166 + - t4003, t4005, t4007 & t4008: handle CR/LF in t/README & t/diff-lib/README

167 + - t3901: move supporting files into t/t3901/

168 + - completion: mark bash script as LF-only

169 + - git-new-workdir: mark script as LF-only

170 + - Fix build with core.autocrlf=true

171

195 -* rg/doc-submittingpatches-wordfix (2017-05-01) 1 commit

196 - (merged to 'next' on 2017-04-30 at 4065036588)

197 - + doc: update SubmittingPatches

172 + Make sure our tests would pass when the sources are checked out

173 + with "platform native" line ending convention by default on

174 + Windows. Some "text" files out tests use and the test scripts

175 + themselves that are meant to be run with /bin/sh, ought to be

176 + checked out with eol=LF even on Windows.

177

199 - Will merge to 'master'.

178

179 +* nd/split-index-unshare (2017-05-08) 2 commits

180 + - p3400: add perf tests for rebasing many changes

181 + - split-index: add and use unshare_split_index()

182

202 -* sr/hooks-cwd-doc (2017-05-01) 1 commit

203 - (merged to 'next' on 2017-04-30 at 063dd5cb02)

204 - + githooks.txt: clarify push hooks are always executed in $GIT_DIR

183 + Plug some leaks and updates internal API used to implement the

184 + split index feature to make it easier to avoid such a leak in the

185 + future.

186

206 - Will merge to 'master'.

187 + Will merge to 'next'.

188

189

209 -* tb/dedup-crlf-tests (2017-05-01) 1 commit

210 - - t0027: Some tests are not expensive

190 +* rs/checkout-am-fix-unborn (2017-05-08) 2 commits

191 + - am: check return value of resolve_refdup before using hash

192 + - checkout: check return value of resolve_refdup before using hash

193

212 - Will be rerolled.

194 + A few codepaths in "checkout" and "am" working on an unborn branch

195 + tried to access an uninitialized piece of memory.

196

197 --------------------------------------------------

198 [Stalled]

@@ -330,6 +313,123 @@ of the repositories listed at

313 --------------------------------------------------

314 [Cooking]

315

316 +* bw/submodule-with-bs-path (2017-05-01) 1 commit

317 + - t7400: add !CYGWIN prerequisite to 'add with \\ in path'

318 +

319 + A hotfix to a topic that is already in 'master'.

320 +

321 + Wait for a few days for Acks and then merge to 'master'.

322 +

323 +

324 +* jk/am-leakfix (2017-04-27) 3 commits

325 + (merged to 'next' on 2017-04-30 at 78becd7a96)

326 + + am: shorten ident_split variable name in get_commit_info()

327 + + am: simplify allocations in get_commit_info()

328 + + am: fix commit buffer leak in get_commit_info()

329 +

330 + The codepath in "git am" that is used when running "git rebase"

331 + leaked memory held for the log message of the commits being rebased.

332 +

333 + Will cook in 'next'.

334 +

335 +

336 +* js/plug-leaks (2017-05-08) 26 commits

337 + - fixup! checkout: fix memory leak

338 + - submodule_uses_worktrees(): plug memory leak

339 + - show_worktree(): plug memory leak

340 + - name-rev: avoid leaking memory in the `deref` case

341 + - remote: plug memory leak in match_explicit()

342 + - add_reflog_for_walk: avoid memory leak

343 + - shallow: avoid memory leak

344 + - line-log: avoid memory leak

345 + - receive-pack: plug memory leak in update()

346 + - fast-export: avoid leaking memory in handle_tag()

347 + - mktree: plug memory leaks reported by Coverity

348 + - pack-redundant: plug memory leak

349 + - setup_discovered_git_dir(): plug memory leak

350 + - setup_bare_git_dir(): help static analysis

351 + - split_commit_in_progress(): simplify & fix memory leak

352 + - checkout: fix memory leak

353 + - cat-file: fix memory leak

354 + - mailinfo & mailsplit: check for EOF while parsing

355 + - status: close file descriptor after reading git-rebase-todo

356 + - difftool: address a couple of resource/memory leaks

357 + - get_mail_commit_oid(): avoid resource leak

358 + - git_config_rename_section_in_file(): avoid resource leak

359 + - add_commit_patch_id(): avoid allocating memory unnecessarily

360 + - winansi: avoid buffer overrun

361 + - winansi: avoid use of uninitialized value

362 + - mingw: avoid memory leak when splitting PATH

363 +

364 + Fix memory leaks pointed out by Coverity.

365 +

366 + All looked sensible.

367 +

368 +

369 +* sk/status-short-branch-color-config (2017-04-28) 2 commits

370 + (merged to 'next' on 2017-04-30 at 2a7eb05d7b)

371 + + status: add color config slots for branch info in "--short --branch"

372 + + status: fix missing newline when comment chars are disabled

373 +

374 + The colors in which "git status --short --branch" showed the names

375 + of the current branch and its remote-tracking branch are now

376 + configurable.

377 +

378 + Will cook in 'next'.

379 +

380 +

381 +* jh/close-index-before-stat (2017-04-28) 1 commit

382 + (merged to 'next' on 2017-04-30 at 918d4f3378)

383 + + read-cache: close index.lock in do_write_index

384 +

385 + The timestamp of the index file is now taken after the file is

386 + closed, to help Windows, on which a stale timestamp is reported by

387 + fstat() on a file that is opened for writing and data was written

388 + but not yet closed.

389 +

390 + Will cook in 'next'.

391 +

392 +

393 +* bw/submodule-has-commits-update (2017-05-02) 6 commits

394 + (merged to 'next' on 2017-05-08 at 57267f2277)

395 + + submodule: refactor logic to determine changed submodules

396 + + submodule: improve submodule_has_commits()

397 + + submodule: change string_list changed_submodule_paths

398 + + submodule: remove add_oid_to_argv()

399 + + submodule: rename free_submodules_sha1s()

400 + + submodule: rename add_sha1_to_array()

401 +

402 + Code clean-up and duplicate removal.

403 +

404 + Will cook in 'next'.

405 +

406 +

407 +* ls/travis-relays-for-windows-ci (2017-05-04) 2 commits

408 + - travis-ci: retry if Git for Windows CI returns HTTP error 502 or 503

409 + - travis-ci: handle Git for Windows CI status "failed" explicitly

410 +

411 + Will merge to 'next' after a few CI run in 'pu'.

412 +

413 +

414 +* mb/diff-default-to-indent-heuristics (2017-05-02) 4 commits

415 + (merged to 'next' on 2017-05-08 at 158f401a92)

416 + + add--interactive: drop diff.indentHeuristic handling

417 + + diff: enable indent heuristic by default

418 + + diff: have the diff-* builtins configure diff before initializing revisions

419 + + diff: make the indent heuristic part of diff's basic configuration

420 +

421 + Make the "indent" heuristics the default in "diff" and diff.indentHeuristics

422 + configuration variable an escape hatch for those who do no want it.

423 +

424 + Will cook in 'next'.

425 +

426 +

427 +* tb/dedup-crlf-tests (2017-05-01) 1 commit

428 + - t0027: Some tests are not expensive

429 +

430 + Will be rerolled.

431 +

432 +

433 * jc/repack-threads (2017-04-27) 1 commit

434 - repack: accept --threads=<n> and pass it down to pack-objects

435

@@ -358,8 +458,7 @@ of the repositories listed at

458 Will cook in 'next'.

459

460

361 -* nd/fopen-errors (2017-04-23) 17 commits

362 - - warn_failure_to_open_read_optional_path(): a new helper

461 +* nd/fopen-errors (2017-05-04) 21 commits

462 - t1308: add a test case on open a config directory

463 - config.c: handle error on failing to fopen()

464 - xdiff-interface.c: report errno on failure to stat() or fopen()

@@ -370,22 +469,25 @@ of the repositories listed at

469 - rerere.c: report error on failure to fopen()

470 - remote.c: report error on failure to fopen()

471 - commit.c: report error on failure to fopen() the graft file

472 + - log: fix memory leak in open_next_file()

473 - log: report errno on failure to fopen() a file

374 - - clone: use xfopen() instead of fopen()

474 - blame: report error on open if graft_file is a directory

475 - bisect: report on fopen() error

476 + - ident.c: use fopen_or_warn()

477 + - attr.c: use fopen_or_warn()

478 + - wrapper.c: add fopen_or_warn()

479 + - wrapper.c: add warn_on_fopen_errors()

480 - config.mak.uname: set FREAD_READS_DIRECTORIES for Linux and FreeBSD

378 - - git_fopen: fix a sparse 'not declared' warning

481 + - clone: use xfopen() instead of fopen()

482 + - Use xfopen() in more places

483

484 We often try to open a file for reading whose existence is

485 optional, and silently ignore errors from open/fopen; report such

486 errors if they are not due to missing files.

487

384 - Expecting a reroll that would be much simplified thanks to a higher

385 - level helper.

386 -

387 - cf. <xmqqk26e5swj.fsf@gitster.mtv.corp.google.com>

388 - cf. <CACsJy8D1LuH6qVp15MSkCM_oQphVUUK0r9SeKC5AzX+9Xi2dcw@mail.gmail.com>

488 + Need to resurrect "git_fopen: fix a sparse 'not declared' warning".

489 + It also seems to cause a test failure on MacOS X.

490 + e.g. https://travis-ci.org/git/git/jobs/229585099#L3091

491

492

493 * dt/raise-core-packed-git-limit (2017-04-20) 1 commit

@@ -399,7 +501,8 @@ of the repositories listed at

501 Will cook in 'next'.

502

503

402 -* js/larger-timestamps (2017-04-27) 8 commits

504 +* js/larger-timestamps (2017-05-04) 9 commits

505 + - archive-tar: fix a sparse 'constant too large' warning

506 (merged to 'next' on 2017-04-28 at b56a0d38cd)

507 + use uintmax_t for timestamps

508 + date.c: abort if the system time cannot handle one of our timestamps

@@ -418,11 +521,12 @@ of the repositories listed at

521 move), and then declare uintmax_t is the type to be used as the

522 timestamp_t

523

524 + The tip one from Ramsay needs to be replaced with a newer one.

525 + cf. <70b431dc-c5cc-e376-b63e-6a58ee1385f1@ramsayjones.plus.com>

526 Will cook in 'next'.

527

528

424 -* ab/grep-pcre-v2 (2017-04-25) 20 commits

425 - - SQUASH???

529 +* ab/grep-pcre-v2 (2017-05-02) 19 commits

530 - Makefile & configure: make PCRE v2 the default PCRE implementation

531 - grep: remove support for concurrent use of both PCRE v1 & v2

532 - grep: add support for PCRE v2

@@ -447,7 +551,7 @@ of the repositories listed at

551 can now be chosen to support "grep -P -e '<pattern>'" and friends.

552

553

450 -* bc/object-id (2017-04-23) 53 commits

554 +* bc/object-id (2017-05-08) 53 commits

555 - object: convert parse_object* to take struct object_id

556 - tree: convert parse_tree_indirect to struct object_id

557 - sequencer: convert do_recursive_merge to struct object_id

@@ -504,7 +608,7 @@ of the repositories listed at

608

609 Conversion from uchar[20] to struct object_id continues.

610

507 - Reroll exists and needs to be picked up.

611 + Will merge to 'next'.

612

613

614 * jk/no-null-sha1-in-cache-tree (2017-04-23) 1 commit

@@ -517,18 +621,10 @@ of the repositories listed at

621 Will cook in 'next'.

622

623

520 -* rg/a-the-typo (2017-05-01) 1 commit

521 - (merged to 'next' on 2017-04-30 at a648cf2961)

522 - + fix minor typos

523 -

524 - Typofix.

525 -

526 - Will merge to 'master'.

527 -

528 -

624 * rs/large-zip (2017-05-01) 7 commits

530 - - t5004: require 64-bit support for big ZIP tests

531 - - archive-zip: set version field for big files correctly

625 + (merged to 'next' on 2017-05-02 at a03574e49b)

626 + + t5004: require 64-bit support for big ZIP tests

627 + + archive-zip: set version field for big files correctly

628 (merged to 'next' on 2017-04-26 at a6beab60f2)

629 + archive-zip: support files bigger than 4GB

630 + archive-zip: support archives bigger than 4GB

@@ -549,7 +645,7 @@ of the repositories listed at

645 not update the index when doing its thing.

646

647

552 -* js/rebase-i-final (2017-04-27) 9 commits

648 +* js/rebase-i-final (2017-05-02) 10 commits

649 - rebase -i: rearrange fixup/squash lines using the rebase--helper

650 - t3415: test fixup with wrapped oneline

651 - rebase -i: skip unnecessary picks using the rebase--helper

@@ -559,6 +655,7 @@ of the repositories listed at

655 - rebase -i: do not invent onelines when expanding/collapsing SHA-1s

656 - rebase -i: remove useless indentation

657 - rebase -i: generate the script via rebase--helper

658 + - t3415: verify that an empty instructionFormat is handled as before

659

660 The final batch to "git rebase -i" updates to move more code from

661 the shell script to C.

@@ -673,7 +770,8 @@ of the repositories listed at

770

771

772 * ls/travis-doc-asciidoctor (2017-04-26) 4 commits

676 - - travis-ci: check AsciiDoc/AsciiDoctor stderr output

773 + (merged to 'next' on 2017-05-04 at 813ba54fc3)

774 + + travis-ci: check AsciiDoc/AsciiDoctor stderr output

775 (merged to 'next' on 2017-04-19 at 359c32953b)

776 + travis-ci: unset compiler for jobs that do not need one

777 + travis-ci: parallelize documentation build

@@ -682,7 +780,7 @@ of the repositories listed at

780 Have Travis CI format the documentation with both AsciiDoc and

781 AsciiDoctor.

782

685 - Will merge to 'next' after a few CI run in 'pu'.

783 + Will cook in 'next'.

784

785

786 * mg/status-in-progress-info (2017-04-14) 1 commit

@@ -710,21 +808,22 @@ of the repositories listed at

808 Needs review.

809

810

713 -* bp/sub-process-convert-filter (2017-04-23) 8 commits

811 +* bp/sub-process-convert-filter (2017-05-08) 10 commits

812 - convert: update subprocess_read_status() to not die on EOF

813 - sub-process: move sub-process functions into separate files

814 - convert: rename reusable sub-process functions

815 - convert: update generic functions to only use generic data structures

816 - convert: separate generic structures and variables from the filter specific ones

719 - - convert: split start_multi_file_filter into two separate functions

720 - - convert: move packet_write_list() into pkt-line as packet_writel()

817 + - convert: split start_multi_file_filter() into two separate functions

818 + - convert: move packet_write_line() into pkt-line as packet_writel()

819 - pkt-line: add packet_read_line_gently()

820 + - pkt-line: fix packet_read_line() to handle len < 0 errors

821 + - convert: remove erroneous tests for errno == EPIPE

822

823 Code from "conversion using external process" codepath has been

824 extracted to a separate sub-process.[ch] module.

825

726 - Reroll exists but needs a bit more work.

727 - cf. <20170407120354.17736-1-benpeart@microsoft.com>

826 + Will merge to 'next'.

827

828

829 * mg/name-rev-debug (2017-03-31) 4 commits

What's cooking (2017/05 #02)