027f6eebc2 · 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 2016, #03; Fri, 8)

4 -X-master-at: 5c589a73de4394ad125a4effac227b3aec856fa1

5 -X-next-at: 281e4d64a61b891e32e0344654b580b4203effa6

3 +Subject: What's cooking in git.git (Jul 2016, #04; Mon, 11)

4 +X-master-at: b1ec08fda8e0c3ed19b680404770ca4ec313ca8c

5 +X-next-at: aa0ab43525ebd305d89ffde30b5d5837a535491c

6

7 -What's cooking in git.git (Jul 2016, #03; Fri, 8)

7 +What's cooking in git.git (Jul 2016, #04; Mon, 11)

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

9

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

@@ -12,8 +12,7 @@ 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 -The first few batches for this cycle has been merged to 'master',

16 -and new topics are trickling into 'next'.

15 +The first maintenance release for 2.9.x series has been issued.

16

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

18 of the repositories listed at

@@ -21,95 +20,120 @@ of the repositories listed at

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

21

22 --------------------------------------------------

24 -[New Topics]

23 +[Graduated to "master"]

24

26 -* rs/help-c-source-with-gitattributes (2016-07-07) 1 commit

27 - - .gitattributes: set file type for C files

25 +* jc/send-email-skip-backup (2016-04-12) 1 commit

26 + (merged to 'next' on 2016-06-28 at 67dac59)

27 + + send-email: detect and offer to skip backup files

28

29 - The .c/.h sources are marked as such in our .gitattributes file so

30 - that "git diff -W" and friends would work better.

29 + A careless invocation of "git send-email directory/" after editing

30 + 0001-change.patch with an editor often ends up sending both

31 + 0001-change.patch and its backup file, 0001-change.patch~, causing

32 + embarrassment and a minor confusion. Detect such an input and

33 + offer to skip the backup files when sending the patches out.

34 + Perhaps people will enhance it more once it gains more visibility.

35

32 - Will merge to 'next'.

36

37 +* jk/ansi-color (2016-06-23) 7 commits

38 + (merged to 'next' on 2016-06-28 at 354989c)

39 + + color: support strike-through attribute

40 + + color: support "italic" attribute

41 + + color: allow "no-" for negating attributes

42 + + color: refactor parse_attr

43 + + add skip_prefix_mem helper

44 + + doc: refactor description of color format

45 + + color: fix max-size comment

46

35 -* rs/notes-merge-no-toctou (2016-07-07) 1 commit

36 - - notes-merge: use O_EXCL to avoid overwriting existing files

47 + The output coloring scheme learned two new attributes, italic and

48 + strike, in addition to existing bold, reverse, etc.

49

38 - "git notes merge" had a code to see if a path exists (and fails if

39 - it does) and then open the path for writing (when it doesn't).

40 - Replace it with open with O_EXCL.

50

51 +* jk/perf-any-version (2016-06-22) 2 commits

52 + (merged to 'next' on 2016-06-28 at 6a41c30)

53 + + p4211: explicitly disable renames in no-rename test

54 + + t/perf: fix regression in testing older versions of git

55

43 -* rw/make-needs-librt (2016-07-07) 1 commit

44 - - Makefile: add NEEDS_LIBRT to optionally link with librt

56 + Allow t/perf framework to use the features from the most recent

57 + version of Git even when testing an older installed version.

58

46 - Makefile assumed that -lrt is always available on platforms that

47 - want to use clock_gettime() and CLOCK_MONOTONIC, which is not a

48 - case for recent Mac OS X. The necessary symbols are often found in

49 - libc on many modern systems and having -lrt on the command line, as

50 - long as the library exists, had no effect, but when the platform

51 - removes librt.a that is a different matter--having -lrt will break

52 - the linkage.

59

54 - This change could be seen as a regression for those who do need to

55 - specify -lrt, as they now specifically ask for NEEDS_LIBRT when

56 - building. Hopefully they are in the minority these days.

60 +* jn/preformatted-doc-url (2016-06-22) 1 commit

61 + (merged to 'next' on 2016-06-28 at 60a99eb)

62 + + doc: git-htmldocs.googlecode.com is no more

63

58 - Will merge to 'next'.

64 + The top level documentation "git help git" still pointed at the

65 + documentation set hosted at now-defunct google-code repository.

66 + Update it to point to https://git.github.io/htmldocs/git.html

67 + instead.

68

69

61 -* jc/renormalize-merge-kill-safer-crlf (2016-07-08) 2 commits

62 - - merge: avoid "safer crlf" during recording of merge results

63 - - convert: unify the "auto" handling of CRLF

64 - (this branch is tangled with tb/convert-peek-in-index.)

70 +* js/color-on-windows-comment (2016-06-28) 1 commit

71 + (merged to 'next' on 2016-06-28 at 38a2ea1)

72 + + color.h: remove obsolete comment about limitations on Windows

73

66 - "git merge" with renormalization did not work well with

67 - merge-recursive, due to "safer crlf" conversion kicking in when it

68 - shouldn't.

74 + For a long time, we carried an in-code comment that said our

75 + colored output would work only when we use fprintf/fputs on

76 + Windows, which no longer is the case for the past few years.

77

78

71 -* jk/printf-format (2016-07-08) 3 commits

72 - - commit.c: remove print_commit_list()

73 - - avoid using sha1_to_hex output as printf format

74 - - walker: let walker_say take arbitrary formats

79 +* js/find-commit-subject-ignore-leading-blanks (2016-06-29) 5 commits

80 + (merged to 'next' on 2016-06-29 at 9717e00)

81 + + reset --hard: skip blank lines when reporting the commit subject

82 + + sequencer: use skip_blank_lines() to find the commit subject

83 + + commit -C: skip blank lines at the beginning of the message

84 + (merged to 'next' on 2016-06-28 at 32bbd94)

85 + + commit.c: make find_commit_subject() more robust

86 + + pretty: make the skip_blank_lines() function public

87

76 - Code clean-up to avoid using a variable string that compilers may

77 - feel untrustable as printf-style format given to write_file()

78 - helper function.

88 + A helper function that takes the contents of a commit object and

89 + finds its subject line did not ignore leading blank lines, as is

90 + commonly done by other codepaths. Make it ignore leading blank

91 + lines to match.

92

80 - Will merge to 'next'.

93

94 +* mj/log-show-signature-conf (2016-06-24) 3 commits

95 + (merged to 'next' on 2016-06-28 at c8b3347)

96 + + log: add log.showSignature configuration variable

97 + + log: add "--no-show-signature" command line option

98 + + t4202: refactor test

99 +

100 + "git log" learns log.showSignature configuration variable, and a

101 + command line option "--no-show-signature" to countermand it.

102

83 -* jk/write-file (2016-07-08) 9 commits

84 - - branch: use write_file_buf instead of write_file

85 - - use write_file_buf where applicable

86 - - write_file: add format attribute

87 - - write_file: add pointer+len variant

88 - - write_file: use xopen

89 - - write_file: drop "gently" form

90 - - branch: use non-gentle write_file for branch description

91 - - am: ignore return value of write_file()

92 - - config: fix bogus fd check when setting up default config

103

94 - General code clean-up around a helper function to write a

95 - single-liner to a file.

104 +* sb/submodule-clone-retry (2016-06-13) 2 commits

105 + (merged to 'next' on 2016-06-28 at 8a86d54)

106 + + submodule update: continue when a clone fails

107 + + submodule--helper: initial clone learns retry logic

108 +

109 + "git submodule update" that drives many "git clone" could

110 + eventually hit flaky servers/network conditions on one of the

111 + submodules; the command learned to retry the attempt.

112 +

113 +--------------------------------------------------

114 +[New Topics]

115 +

116 +* js/ignore-space-at-eol (2016-07-11) 2 commits

117 + - diff: fix a double off-by-one with --ignore-space-at-eol

118 + - diff: demonstrate a bug with --patience and --ignore-space-at-eol

119 +

120 + An age old bug that caused "git diff --ignore-space-at-eol"

121 + misbehave has been fixed.

122

123 Will merge to 'next'.

98 - While it is textually independent, jk/printf-format needs to be

99 - merged before this one.

124

125

102 -* js/am-call-theirs-theirs-in-fallback-3way (2016-07-08) 1 commit

103 - - am: counteract gender bias

126 +* js/rebase-i-tests (2016-07-07) 3 commits

127 + - rebase -i: we allow extra spaces after fixup!/squash!

128 + - rebase -i: demonstrate a bug with --autosquash

129 + - t3404: add a test for the --gpg-sign option

130

105 - One part of "git am" had an oddball helper function that called

106 - stuff from outside "his" as opposed to calling what we have "ours",

107 - which was not gender-neutral and also inconsistent with the rest of

108 - the system where outside stuff is usuall called "theirs" in

109 - contrast to "ours".

131 + A few tests that specifically target "git rebase -i" have been

132 + added.

133

134 Will merge to 'next'.

135

136 +

137 --------------------------------------------------

138 [Stalled]

139

@@ -238,24 +262,112 @@ of the repositories listed at

262 --------------------------------------------------

263 [Cooking]

264

241 -* ak/lazy-prereq-mktemp (2016-07-06) 1 commit

242 - - t7610: test for mktemp before test execution

265 +* jc/renormalize-merge-kill-safer-crlf (2016-07-08) 2 commits

266 + - merge: avoid "safer crlf" during recording of merge results

267 + - convert: unify the "auto" handling of CRLF

268 + (this branch is tangled with tb/convert-peek-in-index.)

269 +

270 + "git merge" with renormalization did not work well with

271 + merge-recursive, due to "safer crlf" conversion kicking in when it

272 + shouldn't.

273 +

274 + Waiting for further discussion; hopefully can move this forward.

275 +

276 +

277 +* rs/help-c-source-with-gitattributes (2016-07-07) 1 commit

278 + (merged to 'next' on 2016-07-11 at b90b7d0)

279 + + .gitattributes: set file type for C files

280 +

281 + The .c/.h sources are marked as such in our .gitattributes file so

282 + that "git diff -W" and friends would work better.

283 +

284 + Will merge to 'master'.

285

244 - A test that unconditionally used "mktemp" learned that the command

245 - is not necessarily available everywhere.

286 +

287 +* rs/notes-merge-no-toctou (2016-07-07) 1 commit

288 + - notes-merge: use O_EXCL to avoid overwriting existing files

289 +

290 + "git notes merge" had a code to see if a path exists (and fails if

291 + it does) and then open the path for writing (when it doesn't).

292 + Replace it with open with O_EXCL.

293

294 Will merge to 'next'.

295

296

250 -* ew/svn-bad-ref (2016-07-06) 1 commit

251 - - git-svn: warn instead of dying when commit data is missing

297 +* rw/make-needs-librt (2016-07-11) 2 commits

298 + - config.mak.uname: define NEEDS_LIBRT under Linux, for now

299 + - Makefile: add NEEDS_LIBRT to optionally link with librt

300 +

301 + Makefile assumed that -lrt is always available on platforms that

302 + want to use clock_gettime() and CLOCK_MONOTONIC, which is not a

303 + case for recent Mac OS X. The necessary symbols are often found in

304 + libc on many modern systems and having -lrt on the command line, as

305 + long as the library exists, had no effect, but when the platform

306 + removes librt.a that is a different matter--having -lrt will break

307 + the linkage.

308 +

309 + This change could be seen as a regression for those who do need to

310 + specify -lrt, as they now specifically ask for NEEDS_LIBRT when

311 + building. Hopefully they are in the minority these days.

312 +

313 + Will merge to 'next'.

314 +

315 +

316 +* jk/printf-format (2016-07-08) 3 commits

317 + (merged to 'next' on 2016-07-11 at 731eafb)

318 + + commit.c: remove print_commit_list()

319 + + avoid using sha1_to_hex output as printf format

320 + + walker: let walker_say take arbitrary formats

321 +

322 + Code clean-up to avoid using a variable string that compilers may

323 + feel untrustable as printf-style format given to write_file()

324 + helper function.

325 +

326 + Will merge to 'master'.

327

253 - An earlier update to "git svn" tightened the parsing of refs given

254 - as the command line arguments too much. This has been fixed by

255 - loosening the check a bit.

328

257 - I'm likely to discard this, favouring a direct pull request from

258 - the subsystem maintainer directly going to 'master'.

329 +* jk/write-file (2016-07-08) 9 commits

330 + (merged to 'next' on 2016-07-11 at f51b449)

331 + + branch: use write_file_buf instead of write_file

332 + + use write_file_buf where applicable

333 + + write_file: add format attribute

334 + + write_file: add pointer+len variant

335 + + write_file: use xopen

336 + + write_file: drop "gently" form

337 + + branch: use non-gentle write_file for branch description

338 + + am: ignore return value of write_file()

339 + + config: fix bogus fd check when setting up default config

340 +

341 + General code clean-up around a helper function to write a

342 + single-liner to a file.

343 +

344 + Will merge to 'master'.

345 +

346 + While it is textually independent, jk/printf-format needs to be

347 + merged before this one.

348 +

349 +

350 +* js/am-call-theirs-theirs-in-fallback-3way (2016-07-08) 1 commit

351 + (merged to 'next' on 2016-07-11 at abae4bc)

352 + + am: counteract gender bias

353 +

354 + One part of "git am" had an oddball helper function that called

355 + stuff from outside "his" as opposed to calling what we have "ours",

356 + which was not gender-neutral and also inconsistent with the rest of

357 + the system where outside stuff is usuall called "theirs" in

358 + contrast to "ours".

359 +

360 + Will merge to 'master'.

361 +

362 +

363 +* ak/lazy-prereq-mktemp (2016-07-06) 1 commit

364 + (merged to 'next' on 2016-07-11 at 66a9384)

365 + + t7610: test for mktemp before test execution

366 +

367 + A test that unconditionally used "mktemp" learned that the command

368 + is not necessarily available everywhere.

369 +

370 + Will merge to 'master'.

371

372

373 * jk/difftool-in-subdir (2016-07-06) 1 commit

@@ -268,7 +380,8 @@ of the repositories listed at

380 Waiting for an ack.

381

382

271 -* nd/test-helpers (2016-07-06) 2 commits

383 +* nd/test-helpers (2016-07-11) 3 commits

384 + - t/test-lib.sh: fix running tests with --valgrind

385 - Makefile: use VCSSVN_LIB to refer to svn library

386 - Makefile: drop extra dependencies for test helpers

387

@@ -287,21 +400,22 @@ of the repositories listed at

400

401

402 * jk/common-main (2016-07-06) 1 commit

290 - - Merge branch 'jk/common-main-2.8' into jk/common-main

403 + (merged to 'next' on 2016-07-11 at 1c2228a)

404 + + Merge branch 'jk/common-main-2.8' into jk/common-main

405 (this branch uses jk/common-main-2.8.)

406

407 Prepare jk/commin-main-2.8 topic to be mergeable to 2.9 and later.

408

295 - Will merge to 'next'.

409 + Will merge to 'master'.

410

411

412 * jk/common-main-2.8 (2016-07-06) 6 commits

299 - - mingw: declare main()'s argv as const

300 - - common-main: call git_setup_gettext()

301 - - common-main: call restore_sigpipe_to_default()

302 - - common-main: call sanitize_stdfds()

303 - - common-main: call git_extract_argv0_path()

304 - - add an extra level of indirection to main()

413 + + mingw: declare main()'s argv as const

414 + + common-main: call git_setup_gettext()

415 + + common-main: call restore_sigpipe_to_default()

416 + + common-main: call sanitize_stdfds()

417 + + common-main: call git_extract_argv0_path()

418 + + add an extra level of indirection to main()

419 (this branch is used by jk/common-main.)

420

421 There are certain house-keeping tasks that need to be performed at

@@ -385,17 +499,6 @@ of the repositories listed at

499 Needs review.

500

501

388 -* js/color-on-windows-comment (2016-06-28) 1 commit

389 - (merged to 'next' on 2016-06-28 at 38a2ea1)

390 - + color.h: remove obsolete comment about limitations on Windows

391 -

392 - For a long time, we carried an in-code comment that said our

393 - colored output would work only when we use fprintf/fputs on

394 - Windows, which no longer is the case for the past few years.

395 -

396 - Will merge to 'master'.

397 -

398 -

502 * js/sign-empty-commit-fix (2016-06-29) 1 commit

503 (merged to 'next' on 2016-07-06 at 448da1b)

504 + commit -S: avoid invalid pointer with empty message

@@ -417,12 +520,13 @@ of the repositories listed at

520

521

522 * ls/p4-tmp-refs (2016-07-08) 1 commit

420 - - git-p4: place temporary refs used for branch import under refs/git-p4-tmp

523 + (merged to 'next' on 2016-07-11 at 4af2d93)

524 + + git-p4: place temporary refs used for branch import under refs/git-p4-tmp

525

526 "git p4" used a location outside $GIT_DIR/refs/ to place its

527 temporary branches, which has been moved to refs/git-p4-tmp/.

528

425 - Will merge to 'next'.

529 + Will merge to 'master'.

530

531

532 * jc/pull-rebase-ff (2016-06-29) 1 commit

@@ -456,15 +560,16 @@ of the repositories listed at

560

561

562 * jk/test-match-signal (2016-07-06) 4 commits

459 - - t/lib-git-daemon: use test_match_signal

460 - - test_must_fail: use test_match_signal

461 - - t0005: use test_match_signal as appropriate

462 - - tests: factor portable signal check out of t0005

563 + (merged to 'next' on 2016-07-11 at 54e1462)

564 + + t/lib-git-daemon: use test_match_signal

565 + + test_must_fail: use test_match_signal

566 + + t0005: use test_match_signal as appropriate

567 + + tests: factor portable signal check out of t0005

568

569 The test framework learned a new helper test_match_signal to check

570 an exit code from getting killed by an expected signal.

571

467 - Will merge to 'next'.

572 + Will merge to 'master'.

573

574

575 * ah/unpack-trees-advice-messages (2016-06-27) 1 commit

@@ -521,7 +626,9 @@ of the repositories listed at

626 review discussion. Otherwise looked good.

627

628

524 -* sb/submodule-parallel-fetch (2016-06-27) 2 commits

629 +* sb/submodule-parallel-fetch (2016-07-11) 3 commits

630 + (merged to 'next' on 2016-07-11 at 4983ded)

631 + + hoist out handle_nonblock function for xread and xwrite

632 (merged to 'next' on 2016-07-06 at de5fd35)

633 + xwrite: poll on non-blocking FDs

634 + xread: retry after poll on EAGAIN/EWOULDBLOCK

@@ -551,33 +658,16 @@ of the repositories listed at

658

659

660 * nd/fetch-ref-summary (2016-07-06) 5 commits

554 - - fetch: reduce duplicate in ref update status lines with placeholder

555 - - fetch: align all "remote -> local" output

556 - - fetch: change flag code for displaying tag update and deleted ref

557 - - fetch: refactor ref update status formatting code

558 - - git-fetch.txt: document fetch output

661 + (merged to 'next' on 2016-07-11 at 379df9f)

662 + + fetch: reduce duplicate in ref update status lines with placeholder

663 + + fetch: align all "remote -> local" output

664 + + fetch: change flag code for displaying tag update and deleted ref

665 + + fetch: refactor ref update status formatting code

666 + + git-fetch.txt: document fetch output

667

668 Improve the look of the way "git fetch" reports what happened to

669 each ref that was fetched.

670

563 - Will merge to 'next'.

564 -

565 -

566 -* jk/perf-any-version (2016-06-22) 2 commits

567 - (merged to 'next' on 2016-06-28 at 6a41c30)

568 - + p4211: explicitly disable renames in no-rename test

569 - + t/perf: fix regression in testing older versions of git

570 -

571 - Allow t/perf framework to use the features from the most recent

572 - version of Git even when testing an older installed version.

573 -

574 - Will merge to 'master'.

575 -

576 -

577 -* jn/preformatted-doc-url (2016-06-22) 1 commit

578 - (merged to 'next' on 2016-06-28 at 60a99eb)

579 - + doc: git-htmldocs.googlecode.com is no more

580 -

671 Will merge to 'master'.

672

673

@@ -598,51 +688,24 @@ of the repositories listed at

688 Will merge to 'next'.

689

690

601 -* jk/ansi-color (2016-06-23) 7 commits

602 - (merged to 'next' on 2016-06-28 at 354989c)

603 - + color: support strike-through attribute

604 - + color: support "italic" attribute

605 - + color: allow "no-" for negating attributes

606 - + color: refactor parse_attr

607 - + add skip_prefix_mem helper

608 - + doc: refactor description of color format

609 - + color: fix max-size comment

610 -

611 - The output coloring scheme learned two new attributes, italic and

612 - strike, in addition to existing bold, reverse, etc.

613 -

614 - Will merge to 'master'.

615 -

616 -

691 * nd/icase (2016-07-01) 12 commits

618 - - grep.c: reuse "icase" variable

619 - - diffcore-pickaxe: support case insensitive match on non-ascii

620 - - diffcore-pickaxe: Add regcomp_or_die()

621 - - grep/pcre: support utf-8

622 - - gettext: add is_utf8_locale()

623 - - grep/pcre: prepare locale-dependent tables for icase matching

624 - - grep: rewrite an if/else condition to avoid duplicate expression

625 - - grep/icase: avoid kwsset when -F is specified

626 - - grep/icase: avoid kwsset on literal non-ascii strings

627 - - test-regex: expose full regcomp() to the command line

628 - - test-regex: isolate the bug test code

629 - - grep: break down an "if" stmt in preparation for next changes

692 + (merged to 'next' on 2016-07-11 at a00d080)

693 + + grep.c: reuse "icase" variable

694 + + diffcore-pickaxe: support case insensitive match on non-ascii

695 + + diffcore-pickaxe: Add regcomp_or_die()

696 + + grep/pcre: support utf-8

697 + + gettext: add is_utf8_locale()

698 + + grep/pcre: prepare locale-dependent tables for icase matching

699 + + grep: rewrite an if/else condition to avoid duplicate expression

700 + + grep/icase: avoid kwsset when -F is specified

701 + + grep/icase: avoid kwsset on literal non-ascii strings

702 + + test-regex: expose full regcomp() to the command line

703 + + test-regex: isolate the bug test code

704 + + grep: break down an "if" stmt in preparation for next changes

705

706 "git grep -i" has been taught to fold case in non-ascii locales

707 correctly.

708

634 - Will merge to 'next'.

635 -

636 -

637 -* mj/log-show-signature-conf (2016-06-24) 3 commits

638 - (merged to 'next' on 2016-06-28 at c8b3347)

639 - + log: add log.showSignature configuration variable

640 - + log: add "--no-show-signature" command line option

641 - + t4202: refactor test

642 -

643 - "git log" learns log.showSignature configuration variable, and a

644 - command line option "--no-show-signature" to countermand it.

645 -

709 Will merge to 'master'.

710

711

@@ -709,24 +772,8 @@ of the repositories listed at

772 Will merge to 'next'.

773

774

712 -* js/find-commit-subject-ignore-leading-blanks (2016-06-29) 5 commits

713 - (merged to 'next' on 2016-06-29 at 9717e00)

714 - + reset --hard: skip blank lines when reporting the commit subject

715 - + sequencer: use skip_blank_lines() to find the commit subject

716 - + commit -C: skip blank lines at the beginning of the message

717 - (merged to 'next' on 2016-06-28 at 32bbd94)

718 - + commit.c: make find_commit_subject() more robust

719 - + pretty: make the skip_blank_lines() function public

720 -

721 - A helper function that takes the contents of a commit object and

722 - finds its subject line did not ignore leading blank lines, as is

723 - commonly done by other codepaths. Make it ignore leading blank

724 - lines to match.

725 -

726 - Will merge to 'master'.

727 -

728 -

729 -* js/log-to-diffopt-file (2016-06-28) 11 commits

775 +* js/log-to-diffopt-file (2016-07-11) 12 commits

776 + - mingw: fix the shortlog --output=<file> test

777 (merged to 'next' on 2016-07-06 at 39e7a5f)

778 + diff: do not color output when --color=auto and --output=<file> is given

779 + t4211: ensure that log respects --output=<file>

@@ -795,18 +842,6 @@ of the repositories listed at

842 Will merge to 'master'.

843

844

798 -* sb/submodule-clone-retry (2016-06-13) 2 commits

799 - (merged to 'next' on 2016-06-28 at 8a86d54)

800 - + submodule update: continue when a clone fails

801 - + submodule--helper: initial clone learns retry logic

802 -

803 - "git submodule update" that drives many "git clone" could

804 - eventually hit flaky servers/network conditions on one of the

805 - submodules; the command learned to retry the attempt.

806 -

807 - Will merge to 'master'.

808 -

809 -

845 * jc/blame-reverse (2016-06-14) 2 commits

846 - blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."

847 - blame: improve diagnosis for "--reverse NEW"

@@ -1030,7 +1065,7 @@ of the repositories listed at

1065 back-burner the threading enhancement to another day.

1066

1067

1033 -* pb/bisect (2016-06-27) 9 commits

1068 +* pb/bisect (2016-07-11) 9 commits

1069 - bisect--helper: `bisect_write` shell function in C

1070 - bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

1071 - bisect--helper: `bisect_reset` shell function in C

@@ -1102,20 +1137,6 @@ of the repositories listed at

1137 Will merge to 'next'.

1138

1139

1105 -* jc/send-email-skip-backup (2016-04-12) 1 commit

1106 - (merged to 'next' on 2016-06-28 at 67dac59)

1107 - + send-email: detect and offer to skip backup files

1108 -

1109 - A careless invocation of "git send-email directory/" after editing

1110 - 0001-change.patch with an editor often ends up sending both

1111 - 0001-change.patch and its backup file, 0001-change.patch~, causing

1112 - embarrassment and a minor confusion. Detect such an input and

1113 - offer to skip the backup files when sending the patches out.

1114 -

1115 - Will merge to 'master'.

1116 - Perhaps people will enhance it more once it gains more visibility.

1117 -

1118 -

1140 * kn/ref-filter-branch-list (2016-05-17) 17 commits

1141 - branch: implement '--format' option

1142 - branch: use ref-filter printing APIs

@@ -1170,6 +1191,8 @@ of the repositories listed at

1191 optionally interface with the watchman daemon to further reduce the

1192 refresh cost.

1193

1194 + Will merge to 'next'.

1195 +

1196 Is everybody happy with this version?

1197 At v14.

1198

@@ -1203,3 +1226,11 @@ of the repositories listed at

1226 It has been reported that git-gui still uses the deprecated syntax,

1227 which needs to be fixed before this final step can proceed.

1228 ($gmane/282594)

1229 +

1230 +--------------------------------------------------

1231 +[Discarded]

1232 +

1233 +* ew/svn-bad-ref (2016-07-06) 1 commit

1234 + . git-svn: warn instead of dying when commit data is missing

1235 +

1236 + Pulled directly from upstream hence discarded.

What's cooking (2016/07 #04)