1ebf75004e · 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 (Jun 2016, #04; Tue, 14)

3 +Subject: What's cooking in git.git (Jun 2016, #05; Thu, 16)

4 X-master-at: 05219a1276341e72d8082d76b7f5ed394b7437a4

5 X-next-at: 3dc84b0c19932ec9947ca4936b6bfd6421ccb1b4

6

7 -What's cooking in git.git (Jun 2016, #04; Tue, 14)

7 +What's cooking in git.git (Jun 2016, #05; Thu, 16)

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

9

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

@@ -12,153 +12,124 @@ 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 -Git 2.9 has been tagged. Let's wait for a few days to clean up

16 -possible fallout and then start a new cycle by rewinding the tip of

17 -'next'. I expect I'd eject a few premature topics out of 'next'

18 -while doing so.

15 +Let's start a new cycle by rewinding the tip of 'next' soonish. I

16 +expect I'd eject a few premature topics out of 'next' while doing

17 +so. There are many topics that need input from the list (look for

18 +'?' in this document) to decide either to drop them or to move them

19 +forward.

20

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

22 of the repositories listed at

23

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

25

25 ---------------------------------------------------

26 -[Graduated to "master"]

27 -

28 -* jc/t2300-setup (2016-06-01) 1 commit

29 - (merged to 'next' on 2016-06-06 at 20f7f83)

30 - + t2300: run git-sh-setup in an environment that better mimics the real life

31 - (this branch is used by va/i18n-even-more.)

32 -

33 - A test fix.

34 -

35 -

36 -* jk/diff-compact-heuristic (2016-06-10) 1 commit

37 - - diff: disable compaction heuristic for now

38 -

39 - It turns out that the earlier effort to update the heuristics may

40 - want to use a bit more time to mature. Turn it off by default.

41 -

42 -

43 -* jk/shell-portability (2016-06-01) 2 commits

44 - (merged to 'next' on 2016-06-06 at 5de784e)

45 - + t5500 & t7403: lose bash-ism "local"

46 - + test-lib: add in-shell "env" replacement

47 -

48 - test fixes.

49 -

26 --------------------------------------------------

27 [New Topics]

28

53 -* lv/status-say-working-tree-not-directory (2016-06-09) 1 commit

54 - - Use "working tree" instead of "working directory" for git status

29 +* ap/git-svn-propset-doc (2016-06-15) 1 commit

30 + - git-svn: document the 'git svn propset' command

31

56 - "git status" used to say "working directory" when it meant "working

57 - tree".

32 + "git svn propset" subcommand that was added in 2.3 days is

33 + documented now.

34

35 Will merge to 'next'.

36

37

62 -* jk/parseopt-string-list (2016-06-13) 3 commits

63 - - blame,shortlog: don't make local option variables static

64 - - interpret-trailers: don't duplicate option strings

65 - - parse_opt_string_list: stop allocating new strings

66 - (this branch is used by jk/string-list-static-init.)

38 +* jk/add-i-diff-compact-heuristics (2016-06-16) 1 commit

39 + - add--interactive: respect diff.compactionHeuristic

40

68 - The command line argument parsing that uses OPT_STRING_LIST() often

69 - made a copy of the argv[] element, which was unnecessary.

41 + "git add -i/-p" learned to honor diff.compactionHeuristic

42 + experimental knob, so that the user can work on the same hunk split

43 + as "git diff" output.

44

45 Will merge to 'next'.

46

47

74 -* jk/repack-keep-unreachable (2016-06-14) 3 commits

75 - - repack: extend --keep-unreachable to loose objects

76 - - repack: add --keep-unreachable option

77 - - repack: document --unpack-unreachable option

48 +* jk/big-and-old-archive-tar (2016-06-16) 2 commits

49 + - archive-tar: write extended headers for far-future mtime

50 + - archive-tar: write extended headers for file sizes >= 8GB

51

79 - "git repack" learned the "--keep-unreachable" option, which sends

80 - loose unreachable objects to a pack instead of leaving them loose.

81 - This helps heuristics based on the number of loose objects

82 - (e.g. "gc --auto").

52 + "git archive" learned to handle files that are larger than 8GB and

53 + commits far in the future than expressible by the traditional US-TAR

54 + format.

55

56 Will merge to 'next'.

57

58

87 -* lf/recv-sideband-cleanup (2016-06-13) 1 commit

88 - - sideband.c: refactor recv_sideband()

89 -

90 - Code simplification. It however loses the atomicity of the output

91 - 9ac13ec9 (atomic write for sideband remote messages, 2006-10-11)

92 - tried to add to an once-much-simpler codebase.

93 -

94 - Expecting a reroll.

59 +* jk/gpg-interface-cleanup (2016-06-16) 7 commits

60 + - gpg-interface: check gpg signature creation status

61 + - sign_buffer: use pipe_command

62 + - verify_signed_buffer: use pipe_command

63 + - run-command: add pipe_command helper

64 + - verify_signed_buffer: use tempfile object

65 + - verify_signed_buffer: drop pbuf variable

66 + - gpg-interface: use child_process.args

67

68 + A new run-command API function pipe_command() is introduced to

69 + sanely feed data to the standard input while capturing data from

70 + the standard output and the standard error of an external process,

71 + which is cumbersome to hand-roll correctly without deadlocking.

72

97 -* nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit

98 - - lib-httpd.sh: print error.log on error

99 -

100 - Debugging aid.

73 + The codepath to sign data in a prepared buffer with GPG has been

74 + updated to use this API to read from the status-fd to check for

75 + errors (instead of relying on GPG's exit status).

76

77 Will merge to 'next'.

78

79

105 -* pc/occurred (2016-06-10) 2 commits

106 - - config.c: fix misspelt "occurred" in an error message

107 - - refs.h: fix misspelt "occurred" in a comment

80 +* lf/sideband-returns-void (2016-06-16) 2 commits

81 + - upload-pack.c: make send_client_data() return void

82 + - sideband.c: make send_sideband() return void

83

109 - Will merge to 'next'.

110 -

111 -

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

113 - - submodule update: continue when a clone fails

114 - - submodule--helper: initial clone learns retry logic

115 - (this branch uses sb/submodule-recommend-shallowness.)

116 -

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

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

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

84 + A small internal API cleanup.

85

86 + Will merge to 'next'.

87

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

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

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

88

89 +* nd/graph-width-padded (2016-06-16) 2 commits

90 + - pretty.c: support <direction>|(<negative number>) forms

91 + - pretty: pass graph width to pretty formatting for use in '%>|(N)'

92

127 -* jc/deref-tag (2016-06-14) 1 commit

128 - - blame, line-log: do not loop around deref_tag()

129 -

130 - Code clean-up.

93 + "log --graph --format=" learned that "%>|(N)" specifies the width

94 + relative to the terminal's left edge, not relative to the area to

95 + draw text that is to the right of the ancestry-graph section. It

96 + also now accepts negative N that means the column limit is relative

97 + to the right border.

98

99 Will merge to 'next'.

100

101

135 -* jk/fetch-prune-doc (2016-06-14) 1 commit

136 - - fetch: document that pruning happens before fetching

102 +* dn/gpg-doc (2016-06-16) 1 commit

103 + - Documentation: GPG capitalization

104

138 - Will merge to 'next'.

139 -

140 -

141 -* km/fetch-do-not-free-remote-name (2016-06-14) 1 commit

142 - - builtin/fetch.c: don't free remote->name after fetch

105 + The documentation tries to consistently spell "GPG"; when

106 + referring to the specific program name, "gpg" is used.

107

108 Will merge to 'next'.

109

110

147 -* nb/gnome-keyring-build (2016-06-14) 1 commit

148 - - gnome-keyring: Don't hard-code pkg-config executable

111 +* jk/bisect-show-tree (2016-06-16) 1 commit

112 + - bisect: always call setup_revisions after init_revisions

113

150 - Build improvements for gnome-keyring (in contrib/)

114 + "git bisect" makes an internal call to "git diff-tree" when

115 + bisection finds the culprit, but this call did not initialize the

116 + data structure to pass to the diff-tree API correctly.

117

118 Will merge to 'next'.

119

120 +--------------------------------------------------

121 +[Stalled]

122

155 -* pb/strbuf-read-file-doc (2016-06-14) 1 commit

156 - - strbuf: describe the return value of strbuf_read_file

123 +* mj/log-show-signature-conf (2016-06-06) 2 commits

124 + - log: "--no-show-signature" commmand-line option

125 + - log: add "log.showsignature" configuration variable

126

158 - Will merge to 'next'.

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

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

129 +

130 + The order of the commits in the topic need to be reversed.

131 + Expecting a reroll.

132

160 ---------------------------------------------------

161 -[Stalled]

133

134 * sb/bisect (2016-04-15) 22 commits

135 - SQUASH???

@@ -218,17 +189,6 @@ of the repositories listed at

189 ($gmane/287839)

190

191

221 -* az/p4-bare-no-rebase (2016-02-19) 1 commit

222 - - git-p4.py: Don't try to rebase on submit from bare repository

223 -

224 - "git p4 submit" attempts to do a rebase, which would fail if done

225 - in a bare repository. Not doing this rebase would paper over the

226 - failure, which is what this patch does, but it is unclear what the

227 - side effect of not rebasing is.

228 -

229 - Needs a better explanation.

230 -

231 -

192 * nd/icase (2016-02-15) 12 commits

193 - grep.c: reuse "icase" variable

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

@@ -245,8 +205,8 @@ of the repositories listed at

205

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

207

248 - Needs review.

249 - ($gmane/286137)

208 + This really needs review. What it attempts to achieve is

209 + worthwhile, I would think ($gmane/286137).

210

211

212 * ec/annotate-deleted (2015-11-20) 1 commit

@@ -266,30 +226,6 @@ of the repositories listed at

226 ($gmane/284426)

227

228

269 -* js/am-3-merge-recursive-direct (2015-10-12) 2 commits

270 - - am: make a direct call to merge_recursive

271 - - merge_recursive_options: introduce the "gently" flag

272 -

273 - The merge_recursive_generic() function has been made a bit safer to

274 - call from inside a process. "git am -3" was taught to make a direct

275 - call to the function when falling back to three-way merge.

276 -

277 - Being able to make a direct call would be good in general, but as a

278 - performance thing, the change needs to be backed up by numbers.

279 -

280 - I haven't gone through the "gently" change with fine toothed comb;

281 - I can see that the change avoids calling die(), but I haven't made

282 - sure that the program states (e.g. what's in the in-core index) are

283 - adjusted sensibly when it returns to the caller instead of dying,

284 - or the codepaths that used to die() are free of resource leaks.

285 - The original code certainly did not care the program states at the

286 - point of dying exactly because it knew it is going to exit, but now

287 - they have to care, and they need to be audited.

288 -

289 - Will be rerolled.

290 - ($gmane/292205)

291 -

292 -

229 * dk/gc-more-wo-pack (2016-01-13) 4 commits

230 - gc: clean garbage .bitmap files from pack dir

231 - t5304: ensure non-garbage files are not deleted

@@ -318,23 +254,125 @@ of the repositories listed at

254 The fix in this patch is broken, unfortunately.

255 Will discard.

256

257 +--------------------------------------------------

258 +[Cooking]

259

322 -* jc/merge-impossible-no-commit (2016-04-26) 2 commits

323 - - merge: warn --no-commit merge when no new commit is created

324 - - merge: do not contaminate option_commit with --squash

260 +* lv/status-say-working-tree-not-directory (2016-06-09) 1 commit

261 + - Use "working tree" instead of "working directory" for git status

262

326 - "git merge --no-commit" silently succeeded when there is no need to

327 - create any commit, either when you are more recent than the commit

328 - you tried to merge, or you can fast-forward to the commit you tried

329 - to merge. The command gives a warning message in such cases.

263 + "git status" used to say "working directory" when it meant "working

264 + tree".

265

331 - Just tying loose ends in a discussion. Unless somebody else

332 - champions this topic, I'll drop it.

266 + Will merge to 'next'.

267

334 - Will discard.

268

336 ---------------------------------------------------

337 -[Cooking]

269 +* jk/parseopt-string-list (2016-06-13) 3 commits

270 + - blame,shortlog: don't make local option variables static

271 + - interpret-trailers: don't duplicate option strings

272 + - parse_opt_string_list: stop allocating new strings

273 + (this branch is used by jk/string-list-static-init.)

274 +

275 + The command line argument parsing that uses OPT_STRING_LIST() often

276 + made a copy of the argv[] element, which was unnecessary.

277 +

278 + Will merge to 'next'.

279 +

280 +

281 +* jk/repack-keep-unreachable (2016-06-14) 3 commits

282 + - repack: extend --keep-unreachable to loose objects

283 + - repack: add --keep-unreachable option

284 + - repack: document --unpack-unreachable option

285 +

286 + "git repack" learned the "--keep-unreachable" option, which sends

287 + loose unreachable objects to a pack instead of leaving them loose.

288 + This helps heuristics based on the number of loose objects

289 + (e.g. "gc --auto").

290 +

291 + Will merge to 'next'.

292 +

293 +

294 +* lf/recv-sideband-cleanup (2016-06-13) 1 commit

295 + - sideband.c: refactor recv_sideband()

296 +

297 + Code simplification. It however loses the atomicity of the output

298 + 9ac13ec9 (atomic write for sideband remote messages, 2006-10-11)

299 + tried to add to an once-much-simpler codebase.

300 +

301 + Expecting a reroll.

302 +

303 +

304 +* nd/test-lib-httpd-show-error-log-in-verbose (2016-06-13) 1 commit

305 + - lib-httpd.sh: print error.log on error

306 +

307 + Debugging aid.

308 +

309 + Will merge to 'next'.

310 +

311 +

312 +* pc/occurred (2016-06-10) 2 commits

313 + - config.c: fix misspelt "occurred" in an error message

314 + - refs.h: fix misspelt "occurred" in a comment

315 +

316 + Will merge to 'next'.

317 +

318 +

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

320 + - submodule update: continue when a clone fails

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

322 + (this branch uses sb/submodule-recommend-shallowness.)

323 +

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

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

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

327 +

328 + Will merge to 'next'.

329 +

330 +

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

332 + - blame: dwim "blame --reverse OLD" as "blame --reverse OLD.."

333 + - blame: improve diagnosis for "--reverse NEW"

334 +

335 + It is a common mistake to say "git blame --reverse OLD path",

336 + expecting that the command line is dwimmed as if asking how lines

337 + in path in an old revision OLD have survived up to the current

338 + commit.

339 +

340 + Any supporters? Otherwise will drop.

341 +

342 +

343 +* jc/deref-tag (2016-06-14) 1 commit

344 + - blame, line-log: do not loop around deref_tag()

345 +

346 + Code clean-up.

347 +

348 + Will merge to 'next'.

349 +

350 +

351 +* jk/fetch-prune-doc (2016-06-14) 1 commit

352 + - fetch: document that pruning happens before fetching

353 +

354 + Will merge to 'next'.

355 +

356 +

357 +* km/fetch-do-not-free-remote-name (2016-06-14) 1 commit

358 + - builtin/fetch.c: don't free remote->name after fetch

359 +

360 + Will merge to 'next'.

361 +

362 +

363 +* nb/gnome-keyring-build (2016-06-14) 1 commit

364 + - gnome-keyring: Don't hard-code pkg-config executable

365 +

366 + Build improvements for gnome-keyring (in contrib/)

367 +

368 + Will merge to 'next'.

369 +

370 +

371 +* pb/strbuf-read-file-doc (2016-06-14) 1 commit

372 + - strbuf: describe the return value of strbuf_read_file

373 +

374 + Will merge to 'next'.

375 +

376

377 * nd/shallow-deepen (2016-06-13) 27 commits

378 - fetch, upload-pack: --deepen=N extends shallow boundary by N commits

@@ -374,6 +412,8 @@ of the repositories listed at

412 "Give me only the history since that version".

413

414 Rerolled.

415 + Needs review. What this topic attempts to achieve is worthwhile, I

416 + would think.

417

418

419 * jk/avoid-unbounded-alloca (2016-06-07) 1 commit

@@ -405,7 +445,7 @@ of the repositories listed at

445

446 Update the funcname definition to support css files.

447

408 - Will merge to 'master' after 2.9 final.

448 + Will merge to 'master'.

449

450

451 * jc/attr-more (2016-06-09) 8 commits

@@ -422,6 +462,8 @@ of the repositories listed at

462 The beginning of long and tortuous journey to clean-up attribute

463 subsystem implementation.

464

465 + Needs to be redone.

466 +

467

468 * jk/rev-list-count-with-bitmap (2016-06-03) 2 commits

469 (merged to 'next' on 2016-06-06 at dd9b30f)

@@ -432,7 +474,7 @@ of the repositories listed at

474 option did not work well with the counting optimized to look at the

475 bitmap index.

476

435 - Will merge to 'master' after 2.9 final.

477 + Will merge to 'master'.

478

479

480 * mh/ref-iterators (2016-06-03) 13 commits

@@ -455,7 +497,7 @@ of the repositories listed at

497 The API to iterate over all the refs (i.e. for_each_ref(), etc.)

498 has been revamped.

499

458 - Will merge to 'master' after 2.9 final.

500 + Will merge to 'master'.

501

502

503 * ew/mboxrd-format-am (2016-06-06) 3 commits

@@ -467,6 +509,8 @@ of the repositories listed at

509 happens to begin with "From " in the e-mail message is quoted with

510 ">", so that these lines can be restored to their original shape.

511

512 + Will merge to 'next'.

513 +

514

515 * lf/receive-pack-auto-gc-to-client (2016-06-06) 1 commit

516 - receive-pack: send auto-gc output over sideband 2

@@ -476,6 +520,8 @@ of the repositories listed at

520 over sideband, so that they are shown with "remote: " prefix to

521 avoid confusing the users.

522

523 + Will merge to 'next'.

524 +

525

526 * mg/cherry-pick-multi-on-unborn (2016-06-06) 1 commit

527 - cherry-pick: allow to pick to unborn branches

@@ -483,26 +529,7 @@ of the repositories listed at

529 "git cherry-pick A" worked on an unborn branch, but "git

530 cherry-pick A..B" didn't.

531

486 -

487 -* mj/log-show-signature-conf (2016-06-06) 2 commits

488 - - log: "--no-show-signature" commmand-line option

489 - - log: add "log.showsignature" configuration variable

490 -

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

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

493 -

494 - The order of the commits in the topic need to be reversed.

495 -

496 -

497 -* nd/i-t-a-commitable (2016-06-06) 3 commits

498 - - commit: don't count i-t-a entries when checking if the new commit is empty

499 - - Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"

500 - - diff.h: extend "flags" field to 64 bits because we're out of bits

501 -

502 - "rm .git/index && git add -N * && git commit" allows you to create

503 - an empty commit without --allow-empty; attempt to forbid it.

504 -

505 - Breaks many tests by completely butchering "git commit", it seems.

532 + Will merge to 'next'.

533

534

535 * sg/reflog-past-root (2016-06-06) 1 commit

@@ -512,6 +539,8 @@ of the repositories listed at

539 creation event (aka "unborn"), which made it appear as if the

540 reflog was truncated.

541

542 + Will merge to 'next'.

543 +

544

545 * tb/complete-status (2016-06-10) 3 commits

546 - completion: add git status

@@ -521,6 +550,8 @@ of the repositories listed at

550 The completion script (in contrib/) learned to complete "git

551 status" options.

552

553 + Any further comments? Otherwise will merge to 'next'.

554 +

555

556 * tr/doc-tt (2016-06-08) 4 commits

557 - doc: change configuration variables format

@@ -541,6 +572,8 @@ of the repositories listed at

572 The git-prompt scriptlet (in contrib/) was not friendly with those

573 who uses "set -u", which has been fixed.

574

575 + Will merge to 'next'.

576 +

577

578 * rj/compat-regex-size-max-fix (2016-06-06) 1 commit

579 - regex: fix a SIZE_MAX macro redefinition warning

@@ -550,20 +583,6 @@ of the repositories listed at

583 Will merge to 'next'.

584

585

553 -* bc/cocci-object-id (2016-06-06) 8 commits

554 - - merge-recursive: convert merge_recursive_generic to object_id

555 - - merge-recursive: convert leaf functions to use struct object_id

556 - - merge-recursive: convert struct merge_file_info to object_id

557 - - merge-recursive: convert struct stage_data to use object_id

558 - - Rename struct diff_filespec's sha1_valid member.

559 - - Convert struct diff_filespec to struct object_id

560 - - Apply standard object_id Coccinelle transformations.

561 - - Add basic Coccinelle transforms.

562 -

563 - Move from "unsigned char [20]" to "struct object_id" continues,

564 - with help from an automated tool.

565 -

566 -

586 * et/add-chmod-x (2016-06-07) 1 commit

587 - add: add --chmod=+x / --chmod=-x options

588

@@ -586,7 +605,10 @@ of the repositories listed at

605 - connect: call get_host_and_port() earlier

606 - connect: document why we sometimes call get_port after get_host_and_port

607

589 - Ok, folks, is everybody happy with this version?

608 + Rewrite Git-URL parsing routine (hopefully) without changing any

609 + behaviour.

610 +

611 + Will merge to 'next'???

612

613

614 * aq/upload-pack-use-parse-options (2016-05-31) 1 commit

@@ -596,7 +618,7 @@ of the repositories listed at

618 "git upload-pack" command has been updated to use the parse-options

619 API.

620

599 - Will merge to 'master' after 2.9 final.

621 + Will merge to 'master'.

622

623

624 * jc/clear-pathspec (2016-06-02) 1 commit

@@ -609,7 +631,7 @@ of the repositories listed at

631 free_pathspec() function has been renamed to clear_pathspec()

632 to avoid confusion.

633

612 - Will merge to 'master' after 2.9 final.

634 + Will merge to 'master'.

635

636

637 * sb/submodule-recommend-shallowness (2016-05-27) 2 commits

@@ -621,7 +643,7 @@ of the repositories listed at

643 An upstream project can make a recommendation to make only a

644 shallow clone for some submodules in the .gitmodules file it ship.

645

624 - Will merge to 'master' after 2.9 final.

646 + Will merge to 'master'.

647

648

649 * tb/convert-peek-in-index (2016-06-07) 3 commits

@@ -678,6 +700,8 @@ of the repositories listed at

700 One patch from the original submission dropped due to conflicts

701 with other topics in flight.

702

703 + Will merge to 'next'.

704 +

705

706 * jg/dash-is-last-branch-in-worktree-add (2016-05-31) 1 commit

707 (merged to 'next' on 2016-06-02 at 3959ef6)

@@ -686,7 +710,7 @@ of the repositories listed at

710 "git worktree add" learned that '-' can be used as a short-hand for

711 "@{-1}", the previous branch.

712

689 - Will merge to 'master' after 2.9 final.

713 + Will merge to 'master'.

714

715

716 * dk/blame-move-no-reason-for-1-line-context (2016-05-29) 1 commit

@@ -711,7 +735,8 @@ of the repositories listed at

735 command learned a dedicated command pair to create and remoev such

736 a file, so that the users do not have to do this with editor.

737

714 - Ok, folks, is everybody happy with this version?

738 + Is everybody happy with this version?

739 + If so, will merge to 'next'.

740

741

742 * et/pretty-format-c-auto (2016-05-27) 1 commit

@@ -723,7 +748,7 @@ of the repositories listed at

748 --no-color or --color=auto with output not connected to a tty;

749 this was corrected to make the format truly behave as "auto".

750

726 - Will merge to 'master' after 2.9 final.

751 + Will merge to 'master'.

752

753

754 * ew/daemon-socket-keepalive (2016-05-25) 1 commit

@@ -735,7 +760,7 @@ of the repositories listed at

760 for a long time, wasting resources. The socket-level KEEPALIVE has

761 been enabled to allow the OS to notice such failed connections.

762

738 - Will merge to 'master' after 2.9 final.

763 + Will merge to 'master'.

764

765

766 * jk/upload-pack-hook (2016-06-02) 7 commits

@@ -750,7 +775,7 @@ of the repositories listed at

775 Allow a custom "git upload-pack" replacement to respond to

776 "fetch/clone" request.

777

753 - Still under discussion.

778 + Still under discussion???

779 ($gmane/295705).

780

781

@@ -772,7 +797,7 @@ of the repositories listed at

797 file when a change added an entire function at the end of the file,

798 which has been fixed.

799

775 - Will merge to 'master' after 2.9 final.

800 + Will merge to 'master'.

801

802

803 * sb/submodule-misc-cleanups (2016-05-25) 1 commit

@@ -781,7 +806,7 @@ of the repositories listed at

806

807 Minor simplification.

808

784 - Will merge to 'master' after 2.9 final.

809 + Will merge to 'master'.

810

811

812 * sb/submodule-default-paths (2016-06-14) 8 commits

@@ -805,7 +830,7 @@ of the repositories listed at

830 "git pull --rebase --verify-signature" learned to warn the user

831 that "--verify-signature" is a no-op.

832

808 - Will merge to 'master' after 2.9 final.

833 + Will merge to 'master'.

834

835

836 * ep/http-curl-trace (2016-05-24) 2 commits

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

840 HTTP transport gained an option to produce more detailed debugging

841 trace.

842

818 - Rerolled. Is everybody happy with this version?

843 + Will merge to 'next'.

844

845

846 * jc/attr (2016-05-25) 18 commits

@@ -843,6 +868,9 @@ of the repositories listed at

868 The attributes API has been updated so that it can later be

869 optimized using the knowledge of which attributes are queried.

870

871 + Will eject from 'next'.

872 + The updated API needs further rethinking.

873 +

874

875 * cc/apply-introduce-state (2016-06-06) 50 commits

876 (merged to 'next' on 2016-06-06 at 9f6bdcb)

@@ -919,6 +947,10 @@ of the repositories listed at

947

948 Beginning of GSoC "git bisect" project.

949

950 + I know another topic is getting rerolled many times on top of this;

951 + are people happy with these three patches? If so, will merge to

952 + 'next'.

953 +

954

955 * sb/pathspec-label (2016-06-03) 6 commits

956 (merged to 'next' on 2016-06-03 at 362f097)

@@ -937,7 +969,8 @@ of the repositories listed at

969 is in use (at least for now), because the attribute subsystem is

970 not thread-ready.

971

940 - Will hold.

972 + Will eject from 'next'.

973 + The jc/attr topic that this depends on needs to be redone.

974

975

976 * nd/worktree-cleanup-post-head-protection (2016-05-24) 6 commits

@@ -951,8 +984,7 @@ of the repositories listed at

984

985 Further preparatory clean-up for "worktree" feature.

986

954 - Expecting a reroll.

955 - ($gmane/294136, etc.)

987 + Will merge to 'next'.

988

989

990 * mh/split-under-lock (2016-05-13) 33 commits

@@ -995,7 +1027,7 @@ of the repositories listed at

1027 Further preparatory work on the refs API before the pluggable

1028 backend series can land.

1029

998 - Will merge to 'master' after 2.9 final.

1030 + Will merge to 'master'.

1031

1032

1033 * ew/fast-import-unpack-limit (2016-05-29) 2 commits

@@ -1008,7 +1040,7 @@ of the repositories listed at

1040 creating too small a packfile as "git fetch" and "git push" have,

1041 using *.unpackLimit configuration.

1042

1011 - Will hold.

1043 + Will merge to 'master'.

1044

1045

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

@@ -1020,7 +1052,8 @@ of the repositories listed at

1052 embarrassment and a minor confusion. Detect such an input and

1053 offer to skip the backup files when sending the patches out.

1054

1023 - Needs review.

1055 + Will merge to 'next'.

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

1057

1058

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

@@ -1046,7 +1079,7 @@ of the repositories listed at

1079 with the more generic ref-filter API.

1080

1081 Rerolled.

1049 - Needs review.

1082 + This also really needs review.

1083

1084

1085 * dt/index-helper (2016-05-20) 20 commits

@@ -1076,7 +1109,7 @@ of the repositories listed at

1109 optionally interface with the watchman daemon to further reduce the

1110 refresh cost.

1111

1079 - Rerolled.

1112 + Are people happy with this version? If so will merge to 'next'.

1113 ($gmane/295106).

1114

1115

@@ -1092,6 +1125,12 @@ of the repositories listed at

1125 ingredients to allow "git clone" traffic off of the core server

1126 network to CDN.

1127

1128 + While I think it would make it easier for people to experiment and

1129 + build on if the topic is merged to 'next', I am at the same time a

1130 + bit reluctant to merge an unproven new topic that introduces a new

1131 + file format, which we may end up having to support til the end of

1132 + time. Comments?

1133 +

1134

1135 * jc/merge-drop-old-syntax (2015-04-29) 1 commit

1136 - merge: drop 'git merge <message> HEAD <commit>' syntax

@@ -1107,8 +1146,85 @@ of the repositories listed at

1146 --------------------------------------------------

1147 [Discarded]

1148

1110 -* mh/connect-leak (2016-04-28) 1 commit

1111 - . git_connect(): fix memory leak with CONNECT_DIAG_URL

1149 +* js/am-3-merge-recursive-direct (2015-10-12) 2 commits

1150 + . am: make a direct call to merge_recursive

1151 + . merge_recursive_options: introduce the "gently" flag

1152 +

1153 + The merge_recursive_generic() function has been made a bit safer to

1154 + call from inside a process. "git am -3" was taught to make a direct

1155 + call to the function when falling back to three-way merge.

1156 +

1157 + Being able to make a direct call would be good in general, but as a

1158 + performance thing, the change needs to be backed up by numbers.

1159 +

1160 + I haven't gone through the "gently" change with fine toothed comb;

1161 + I can see that the change avoids calling die(), but I haven't made

1162 + sure that the program states (e.g. what's in the in-core index) are

1163 + adjusted sensibly when it returns to the caller instead of dying,

1164 + or the codepaths that used to die() are free of resource leaks.

1165 + The original code certainly did not care the program states at the

1166 + point of dying exactly because it knew it is going to exit, but now

1167 + they have to care, and they need to be audited.

1168 +

1169 + Has a lot of conflict when merged to 'pu' these days, so let's

1170 + eject it from our tree for now.

1171 +

1172 + Will discard.

1173 + ($gmane/292205)

1174 +

1175 +

1176 +* nd/i-t-a-commitable (2016-06-06) 3 commits

1177 + . commit: don't count i-t-a entries when checking if the new commit is empty

1178 + . Resurrect "diff-lib.c: adjust position of i-t-a entries in diff"

1179 + . diff.h: extend "flags" field to 64 bits because we're out of bits

1180 +

1181 + "rm .git/index && git add -N * && git commit" allows you to create

1182 + an empty commit without --allow-empty; attempt to forbid it.

1183 +

1184 + Retracted.

1185 + Will discard.

1186 + ($gmane/297362)

1187 +

1188 +

1189 +* jc/merge-impossible-no-commit (2016-04-26) 2 commits

1190 + . merge: warn --no-commit merge when no new commit is created

1191 + . merge: do not contaminate option_commit with --squash

1192 +

1193 + "git merge --no-commit" silently succeeded when there is no need to

1194 + create any commit, either when you are more recent than the commit

1195 + you tried to merge, or you can fast-forward to the commit you tried

1196 + to merge. The command gives a warning message in such cases.

1197 +

1198 + Just tying loose ends in a discussion. Unless somebody else

1199 + champions this topic, I'll drop it.

1200 +

1201 + Will discard.

1202 +

1203 +

1204 +* bc/cocci-object-id (2016-06-06) 8 commits

1205 + . merge-recursive: convert merge_recursive_generic to object_id

1206 + . merge-recursive: convert leaf functions to use struct object_id

1207 + . merge-recursive: convert struct merge_file_info to object_id

1208 + . merge-recursive: convert struct stage_data to use object_id

1209 + . Rename struct diff_filespec's sha1_valid member.

1210 + . Convert struct diff_filespec to struct object_id

1211 + . Apply standard object_id Coccinelle transformations.

1212 + . Add basic Coccinelle transforms.

1213 +

1214 + Move from "unsigned char [20]" to "struct object_id" continues,

1215 + with help from an automated tool.

1216 +

1217 + Will discard.

1218 + ($gmane/296749)

1219 +

1220 +

1221 +* az/p4-bare-no-rebase (2016-02-19) 1 commit

1222 + - git-p4.py: Don't try to rebase on submit from bare repository

1223 +

1224 + "git p4 submit" attempts to do a rebase, which would fail if done

1225 + in a bare repository. Not doing this rebase would paper over the

1226 + failure, which is what this patch does, but it is unclear what the

1227 + side effect of not rebasing is.

1228

1113 - Is already made obsolete with a patch in flight under discussion.

1114 - ($gmane/292962)

1229 + Retracted.

1230 + ($gmane/296722)

What's cooking (2016/06 #05)