f0b31b7544 · matheusbsbs/matheus-bagliano

@@ -1,152 +1,156 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Oct 2013, #06; Fri, 25)

4 -X-master-at: 3d092bfc6f2d9a998967979f926c661e9762601c

5 -X-next-at: 4bebb6611df42b82d24d2e1efd8b270ca0779f33

3 +Subject: What's cooking in git.git (Oct 2013, #07; Mon, 28)

4 +X-master-at: 0d6cf2471f426dd2b742e2285aad78381738be96

5 +X-next-at: f1bec963d618585da2c32644d95f42c8f174f1ce

6

7 -What's cooking in git.git (Oct 2013, #06; Fri, 25)

7 +What's cooking in git.git (Oct 2013, #07; Mon, 28)

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

9

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

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 +It is already 10th week of this cycle, but somehow I completely

15 +forgot where in the cycle we were. Sorry about that.

16 +

17 +I'll tag 1.8.5-rc0 in a few days by the end of this month, and then

18 +hopefully we will have two to three -rc weeks after that, aiming for

19 +the final 1.8.5 release sometime late November (tentative schedule

20 +at http://tinyurl.com/gitCal).

21 +

22 +As promised/requested, the final steps for 2.0 are in 'next'; they,

23 +together with a handful topics that have been merged to 'next'

24 +fairly recently, will _not_ be part of the upcoming 1.8.5 release,

25 +but will be carried over in 'next' to the next cycle.

26 +

27 +Also there is 1.8.4.2 maintenance release out.

28 +

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

30 of the repositories listed at

31

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

33

34 --------------------------------------------------

20 -[New Topics]

35 +[Graduated to "master"]

36

22 -* bc/http-100-continue (2013-10-23) 1 commit

23 - - http: add option to enable 100 Continue responses

37 +* ew/keepalive (2013-10-16) 2 commits

38 + (merged to 'next' on 2013-10-16 at 56fd9f3)

39 + + http: use curl's tcp keepalive if available

40 + (merged to 'next' on 2013-10-14 at 24d786f)

41 + + http: enable keepalive on TCP sockets

42

25 - Conditionally allow "100 Continue" responses to help use of

26 - GSS-Negotiate authentication scheme over HTTP transport.

43 + The HTTP transport will try to use TCP keepalive when able.

44

28 - Seems to be still under discussion.

45

46 +* jc/revision-range-unpeel (2013-10-15) 1 commit

47 + (merged to 'next' on 2013-10-16 at d04ddfe)

48 + + revision: do not peel tags used in range notation

49

31 -* jc/merge-base-reflog (2013-10-25) 2 commits

32 - - merge-base: teach "--fork-point" mode

33 - - merge-base: use OPT_CMDMODE and clarify the command line parsing

50 + "git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the

51 + output, but "git rev-list --objects v1.0^..v1.0" did not.

52

35 - Code the logic in "pull --rebase" that figures out a fork point

36 - from reflog entries in C.

53

54 +* jk/remote-literal-string-leakfix (2013-10-15) 1 commit

55 + (merged to 'next' on 2013-10-18 at 6abddac)

56 + + remote: do not copy "origin" string literal

57

39 -* jk/date-c-double-semicolon (2013-10-24) 1 commit

40 - - drop redundant semicolon in empty while

58

42 - Will merge to 'next'.

59 +* jk/split-broken-ident (2013-10-15) 1 commit

60 + (merged to 'next' on 2013-10-18 at 8f4b8b7)

61 + + split_ident: parse timestamp from end of line

62

63 + Make the fall-back parsing of commit objects with broken author or

64 + committer lines more robust to pick up the timestamps.

65

45 -* jk/for-each-ref-skip-parsing (2013-10-24) 1 commit

46 - - for-each-ref: avoid loading objects to print %(objectname)

66

48 - Will merge to 'next'.

67 +* jx/relative-path-regression-fix (2013-10-14) 3 commits

68 + (merged to 'next' on 2013-10-18 at b4af45f)

69 + + Use simpler relative_path when set_git_dir

70 + (merged to 'next' on 2013-10-14 at 704b9ee)

71 + + relative_path should honor dos-drive-prefix

72 + + test: use unambigous leading path (/foo) for MSYS

73

74 + Will merge to 'master' and later to 'maint'.

75

51 -* jk/pack-bitmap (2013-10-25) 19 commits

52 - - pack-bitmap: implement optional name_hash cache

53 - - t: add basic bitmap functionality tests

54 - - repack: consider bitmaps when performing repacks

55 - - repack: handle optional files created by pack-objects

56 - - repack: turn exts array into array-of-struct

57 - - repack: stop using magic number for ARRAY_SIZE(exts)

58 - - pack-objects: implement bitmap writing

59 - - rev-list: add bitmap mode to speed up object lists

60 - - pack-objects: use bitmaps when packing objects

61 - - pack-bitmap: add support for bitmap indexes

62 - - documentation: add documentation for the bitmap format

63 - - ewah: compressed bitmap implementation

64 - - compat: add endianness helpers

65 - - sha1_file: export `git_open_noatime`

66 - - revision: allow setting custom limiter function

67 - - pack-objects: factor out name_hash

68 - - pack-objects: refactor the packing list

69 - - revindex: export new APIs

70 - - sha1write: make buffer const-correct

76

72 - Borrows the bitmap index into packfiles from JGit to speed up

73 - enumeration of objects involved in a commit range without having to

74 - fully traverse the history.

77 +* sb/repack-in-c (2013-10-22) 1 commit

78 + (merged to 'next' on 2013-10-23 at 5d7ac72)

79 + + Reword repack documentation to no longer state it's a script

80

81 + Finishing touches to update documentation.

82

77 -* jk/refs-c-squelch-gcc (2013-10-24) 1 commit

78 - - silence gcc array-bounds warning

83

80 - Will merge to 'next'.

84 +* sg/prompt-svn-remote-fix (2013-10-15) 1 commit

85 + (merged to 'next' on 2013-10-18 at 20b47eb)

86 + + bash prompt: don't use '+=' operator in show upstream code path

87

88 + Bash portability fix.

89

83 -* jk/robustify-parse-commit (2013-10-24) 6 commits

84 - - checkout: do not die when leaving broken detached HEAD

85 - - use parse_commit_or_die instead of custom message

86 - - use parse_commit_or_die instead of segfaulting

87 - - assume parse_commit checks for NULL commit

88 - - assume parse_commit checks commit->object.parsed

89 - - log_tree_diff: die when we fail to parse a commit

90 +--------------------------------------------------

91 +[New Topics]

92

91 - Will merge to 'next' after taking another look.

93 +* bw/solaris-sed-tr-test-portability (2013-10-28) 2 commits

94 + - Avoid difference in tr semantics between System V and BSD

95 + - Change sed i\ usage to something Solaris' sed can handle

96

97 + Needs a bit of reroll.

98

94 -* mh/fetch-tags-in-addition-to-normal-refs (2013-10-24) 16 commits

95 - - fetch, remote: properly convey --no-prune options to subprocesses

96 - - builtin/remote.c:update(): use struct argv_array

97 - - builtin/remote.c: reorder function definitions

98 - - query_refspecs(): move some constants out of the loop

99 - - fetch --prune: prune only based on explicit refspecs

100 - - SQUASH??? --tags is no longer a short-hand

101 - - fetch --tags: fetch tags *in addition to* other stuff

102 - - builtin/fetch.c: reorder function definitions

103 - - ref_remove_duplicates(): improve documentation comment

104 - - ref_remove_duplicates(): simplify function

105 - - ref_remove_duplicates(): avoid redundant bisection

106 - - get_ref_map(): rename local variables

107 - - api-remote.txt: correct section "struct refspec"

108 - - t5510: check that "git fetch --prune --tags" does not prune branches

109 - - t5510: prepare test refs more straightforwardly

110 - - t5510: use the correct tag name in test

99

112 - Some questionable paragraphs in the doc updates, but other than

113 - that looks reasonably solid.

100 +* fc/transport-helper-fixes (2013-10-28) 13 commits

101 + - test: remote-helper: add test for force pushes

102 + - git-remote-testgit: support the new 'force' option

103 + - fixup! transport-helper: add 'force' to 'export' helpers

104 + - transport-helper: don't update refs in dry-run

105 + - transport-helper: add support to delete branches

106 + - fast-export: add support to delete refs

107 + - fast-import: add support to delete refs

108 + - transport-helper: add support for old:new refspec

109 + - fast-export: add new --refspec option

110 + - fast-export: improve argument parsing

111 + - transport-helper: check for 'forced update' message

112 + - transport-helper: fix extra lines

113 + - transport-helper: add 'force' to 'export' helpers

114

115

116 -* nd/lift-path-max (2013-10-24) 2 commits

117 - - checkout_entry(): clarify the use of topath[] parameter

118 - - entry.c: convert checkout_entry to use strbuf

116

120 - Will merge to 'next'.

117 +* jh/loose-object-dirs-creation-race (2013-10-28) 1 commit

118 + - sha1_file.c:create_tmpfile(): Fix race when creating loose object dirs

119

120

123 -* jk/pack-corruption-post-mortem (2013-10-25) 1 commit

124 - - howto: add article on recovering a corrupted object

121 +* js/test-help-format-windows-port-fix (2013-10-28) 1 commit

122 + - PATCH] t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html

123 +

124 + Will merge to 'next' after amending the title.

125 +

126 +

127 +* js/tests-windows-port-fix (2013-10-28) 3 commits

128 + - tests: undo special treatment of CRLF for Windows

129 + - Windows: a test_cmp that is agnostic to random LF <> CRLF conversions

130 + - t5300-pack-object: do not compare binary data using test_cmp

131

132 Will merge to 'next'.

133

134

129 -* jk/reset-p-current-head-fix (2013-10-25) 2 commits

130 - - reset: pass real rev name to add--interactive

131 - - add-interactive: handle unborn branch in patch mode

135 +* nd/liteal-pathspecs (2013-10-28) 1 commit

136 + - pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses

137

133 - "git reset -p HEAD" has codepath to special case it from resetting

134 - to contents of other commits, but recent change broke it.

138 +

139 +* rs/web-browse-xdg-open (2013-10-28) 1 commit

140 + - web--browse: Add support for xdg-open.

141

142 Will merge to 'next'.

143

144

139 -* mf/graph-show-root (2013-10-25) 1 commit

140 - - graph.c: mark root commit differently

145 +* sb/refs-code-cleanup (2013-10-28) 2 commits

146 + - cache: remove unused function 'have_git_dir'

147 + - refs: remove unused function invalidate_ref_cache

148

142 - Needs adjustments to some tests.

149 + Will merge to 'next'.

150

151

145 -* nv/parseopt-opt-arg (2013-10-25) 1 commit

146 - - rev-parse --parseopt: add the --sticked-long mode

147 -

148 - Enhance "rev-parse --parseopt" mode to help parsing options with

149 - an optional parameter.

152 +* th/reflog-annotated-tag (2013-10-28) 1 commit

153 + - reflog: handle lightweight and annotated tags equally

154

155 --------------------------------------------------

156 [Stalled]

@@ -194,14 +198,6 @@ of the repositories listed at

198 I am not sure if that is solving a right problem, though.

199

200

197 -* tr/merge-recursive-index-only (2013-07-07) 3 commits

198 - - merge-recursive: -Xindex-only to leave worktree unchanged

199 - - merge-recursive: untangle double meaning of o->call_depth

200 - - merge-recursive: remove dead conditional in update_stages()

201 -

202 - Holding until there is a caller to learn from.

203 -

204 -

201 * jc/ref-excludes (2013-09-03) 2 commits

202 - document --exclude option

203 - revision: introduce --exclude=<glob> to tame wildcards

@@ -266,8 +262,166 @@ of the repositories listed at

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

263 [Cooking]

264

265 +* tr/merge-recursive-index-only (2013-10-28) 3 commits

266 + - merge-recursive: -Xindex-only to leave worktree unchanged

267 + - merge-recursive: internal flag to avoid touching the worktree

268 + - merge-recursive: remove dead conditional in update_stages()

269 +

270 + Holding until there is a caller to learn from.

271 +

272 +

273 +* bc/http-100-continue (2013-10-28) 1 commit

274 + - remote-curl: fix large pushes with GSSAPI

275 +

276 + Conditionally allow "100 Continue" responses to help use of

277 + GSS-Negotiate authentication scheme over HTTP transport.

278 +

279 + Rerolled. Is everybody happy with this version without

280 + configuration?

281 +

282 +

283 +* jc/merge-base-reflog (2013-10-28) 2 commits

284 + - merge-base: teach "--fork-point" mode

285 + - merge-base: use OPT_CMDMODE and clarify the command line parsing

286 +

287 + Code the logic in "pull --rebase" that figures out a fork point

288 + from reflog entries in C.

289 +

290 + Rerolled.

291 +

292 +

293 +* jk/date-c-double-semicolon (2013-10-24) 1 commit

294 + (merged to 'next' on 2013-10-28 at 00ce440)

295 + + drop redundant semicolon in empty while

296 +

297 + Will merge to 'master'.

298 +

299 +

300 +* jk/for-each-ref-skip-parsing (2013-10-24) 1 commit

301 + - for-each-ref: avoid loading objects to print %(objectname)

302 +

303 + Will merge to 'next' and then to 'master'.

304 +

305 +

306 +* jk/pack-bitmap (2013-10-28) 20 commits

307 + - count-objects: consider .bitmap without .pack/.idx pair garbage

308 + - pack-bitmap: implement optional name_hash cache

309 + - t: add basic bitmap functionality tests

310 + - repack: consider bitmaps when performing repacks

311 + - repack: handle optional files created by pack-objects

312 + - repack: turn exts array into array-of-struct

313 + - repack: stop using magic number for ARRAY_SIZE(exts)

314 + - pack-objects: implement bitmap writing

315 + - rev-list: add bitmap mode to speed up object lists

316 + - pack-objects: use bitmaps when packing objects

317 + - pack-bitmap: add support for bitmap indexes

318 + - documentation: add documentation for the bitmap format

319 + - ewah: compressed bitmap implementation

320 + - compat: add endianness helpers

321 + - sha1_file: export `git_open_noatime`

322 + - revision: allow setting custom limiter function

323 + - pack-objects: factor out name_hash

324 + - pack-objects: refactor the packing list

325 + - revindex: export new APIs

326 + - sha1write: make buffer const-correct

327 +

328 + Borrows the bitmap index into packfiles from JGit to speed up

329 + enumeration of objects involved in a commit range without having to

330 + fully traverse the history.

331 +

332 +

333 +* jk/refs-c-squelch-gcc (2013-10-24) 1 commit

334 + (merged to 'next' on 2013-10-28 at d15f7c2)

335 + + silence gcc array-bounds warning

336 +

337 + Will merge to 'master'.

338 +

339 +

340 +* jk/robustify-parse-commit (2013-10-24) 6 commits

341 + - checkout: do not die when leaving broken detached HEAD

342 + - use parse_commit_or_die instead of custom message

343 + - use parse_commit_or_die instead of segfaulting

344 + - assume parse_commit checks for NULL commit

345 + - assume parse_commit checks commit->object.parsed

346 + - log_tree_diff: die when we fail to parse a commit

347 +

348 + Will merge to 'next' after taking another look.

349 +

350 +

351 +* mh/fetch-tags-in-addition-to-normal-refs (2013-10-24) 16 commits

352 + - fetch, remote: properly convey --no-prune options to subprocesses

353 + - builtin/remote.c:update(): use struct argv_array

354 + - builtin/remote.c: reorder function definitions

355 + - query_refspecs(): move some constants out of the loop

356 + - fetch --prune: prune only based on explicit refspecs

357 + - SQUASH??? --tags is no longer a short-hand

358 + - fetch --tags: fetch tags *in addition to* other stuff

359 + - builtin/fetch.c: reorder function definitions

360 + - ref_remove_duplicates(): improve documentation comment

361 + - ref_remove_duplicates(): simplify function

362 + - ref_remove_duplicates(): avoid redundant bisection

363 + - get_ref_map(): rename local variables

364 + - api-remote.txt: correct section "struct refspec"

365 + - t5510: check that "git fetch --prune --tags" does not prune branches

366 + - t5510: prepare test refs more straightforwardly

367 + - t5510: use the correct tag name in test

368 +

369 + Some questionable paragraphs in the doc updates, but other than

370 + that looks reasonably solid.

371 +

372 + Expecting a reroll.

373 +

374 +

375 +* nd/lift-path-max (2013-10-24) 2 commits

376 + (merged to 'next' on 2013-10-28 at 07698af)

377 + + checkout_entry(): clarify the use of topath[] parameter

378 + + entry.c: convert checkout_entry to use strbuf

379 +

380 + Will merge to 'master'.

381 +

382 +

383 +* jk/pack-corruption-post-mortem (2013-10-25) 1 commit

384 + - howto: add article on recovering a corrupted object

385 +

386 + Will merge to 'next' and then to 'master'.

387 +

388 +

389 +* jk/reset-p-current-head-fix (2013-10-25) 2 commits

390 + - reset: pass real rev name to add--interactive

391 + - add-interactive: handle unborn branch in patch mode

392 +

393 + "git reset -p HEAD" has codepath to special case it from resetting

394 + to contents of other commits, but recent change broke it.

395 +

396 + Will merge to 'next' and then to 'master'.

397 +

398 +

399 +* mf/graph-show-root (2013-10-25) 1 commit

400 + - graph.c: mark root commit differently

401 +

402 + In a repository with multiple-roots, "log --graph", especially with

403 + "--oneline", does not give the reader enough visual cue to see

404 + where one line of history ended and a separate history began.

405 +

406 + This is the version that marks the roots 'x' when they would have

407 + been marked as '*'; Keshav Kini suggested an alternative of giving

408 + an extra blank line after every root, which I tend to think is a

409 + better approach to the problem.

410 +

411 +

412 +* nv/parseopt-opt-arg (2013-10-25) 1 commit

413 + - rev-parse --parseopt: add the --sticked-long mode

414 +

415 + Enhance "rev-parse --parseopt" mode to help parsing options with

416 + an optional parameter.

417 +

418 + Option name bikeshedding aside ("Is it sticked or stuck?"), the

419 + change seems to be competently done.

420 +

421 +

422 * ap/remote-hg-unquote-cquote (2013-10-23) 1 commit

270 - - remote-hg: unquote C-style paths when exporting

423 + (merged to 'next' on 2013-10-28 at 6b99fd5)

424 + + remote-hg: unquote C-style paths when exporting

425

426 A fast-import stream expresses a pathname with funny characters by

427 quoting them in C style; remote-hg remote helper forgot to unquote

@@ -277,58 +431,54 @@ of the repositories listed at

431

432

433 * jl/pack-transfer-avoid-double-close (2013-10-23) 1 commit

280 - - Clear fd after closing to avoid double-close error

434 + (merged to 'next' on 2013-10-28 at 4a55bba)

435 + + Clear fd after closing to avoid double-close error

436

437 The codepath that send_pack() calls pack_objects() mistakenly

438 closed the same file descriptor twice, leading to potentially

439 closing a wrong file descriptor that was opened in the meantime.

440

286 - Will merge to 'next'.

287 - Needs to be merged later to 'maint'.

441 + Will merge to 'master' and later to 'maint'.

442

443

444 * nd/magic-pathspec (2013-10-22) 1 commit

291 - - Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags

445 + (merged to 'next' on 2013-10-28 at 50eda68)

446 + + Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags

447

448 All callers to parse_pathspec() must choose between getting no

449 pathspec or one path that is limited to the current directory

450 when there is no paths given on the command line, but there were

451 two callers that violated this rule, triggering a BUG().

452

298 - Will merge to 'next'.

453 + Will merge to 'master'.

454

455

456 * sb/git-svn-docs-indent-with-ht (2013-10-22) 1 commit

302 - - git-svn docs: Use tabs consistently within the ascii doc

457 + (merged to 'next' on 2013-10-28 at 8a952d1)

458 + + git-svn docs: Use tabs consistently within the ascii doc

459

304 - Will merge to 'next'.

460 + Will merge to 'master'.

461

462

463 * tr/gitk-doc-update (2013-10-22) 1 commit

308 - - Documentation: revamp gitk(1)

464 + (merged to 'next' on 2013-10-28 at f4158b8)

465 + + Documentation: revamp gitk(1)

466

310 - Will merge to 'next'.

467 + Will merge to 'master'.

468

469

470 * tr/valgrind-test-fix (2013-10-22) 2 commits

314 - - Revert "test-lib: allow prefixing a custom string before "ok N" etc."

315 - - Revert "test-lib: support running tests under valgrind in parallel"

316 -

317 - Will merge to 'next'.

318 -

319 -

320 -* sb/repack-in-c (2013-10-22) 1 commit

321 - (merged to 'next' on 2013-10-23 at 5d7ac72)

322 - + Reword repack documentation to no longer state it's a script

323 -

324 - Finishing touches to update documentation.

471 + (merged to 'next' on 2013-10-28 at 4d3f31a)

472 + + Revert "test-lib: allow prefixing a custom string before "ok N" etc."

473 + + Revert "test-lib: support running tests under valgrind in parallel"

474

475 Will merge to 'master'.

476

477

478 * mm/checkout-auto-track-fix (2013-10-18) 2 commits

330 - - checkout: proper error message on 'git checkout foo bar --'

331 - - checkout: allow dwim for branch creation for "git checkout $branch --"

479 + (merged to 'next' on 2013-10-28 at f4594ba)

480 + + checkout: proper error message on 'git checkout foo bar --'

481 + + checkout: allow dwim for branch creation for "git checkout $branch --"

482

483 "git checkout topic", when there is not yet a local "topic" branch

484 but there is a unique remote-tracking branch for a remote "topic"

@@ -336,67 +486,43 @@ of the repositories listed at

486 (for that unique remote $r) was run. This hack however was not

487 implemented for "git checkout topic --".

488

339 - Will merge to 'next'.

489 + Will merge to 'master'.

490

491

492 * hn/log-graph-color-octopus (2013-10-18) 1 commit

343 - - graph: fix coloring around octopus merges

344 -

345 - Will merge to 'next'.

346 -

347 -

348 -* nd/gc-lock-against-each-other (2013-10-18) 1 commit

349 - - gc: remove gc.pid file at end of execution

350 -

351 - Will merge to 'next'.

352 -

353 -

354 -* fc/styles (2013-10-16) 7 commits

355 - - block-sha1/sha1.c: have SP around arithmetic operators

356 - - base85.c: have SP around arithmetic operators

357 - - archive.c: have SP around arithmetic operators

358 - - alloc.c: have SP around arithmetic operators

359 - - abspath.c: have SP around arithmetic operators

360 - - alias: have SP around arithmetic operators

361 - - C: have space around && and || operators

362 -

363 - C coding style fixes. The ones near the tip have not been sent to

364 - the list yet (they cover the same kind of style violation as the

365 - second one) and I should send them to the list.

366 -

367 - Will merge to 'next'.

368 -

369 -

370 -* jk/remote-literal-string-leakfix (2013-10-15) 1 commit

371 - (merged to 'next' on 2013-10-18 at 6abddac)

372 - + remote: do not copy "origin" string literal

493 + (merged to 'next' on 2013-10-28 at e103175)

494 + + graph: fix coloring around octopus merges

495

496 Will merge to 'master'.

497

498

377 -* jk/split-broken-ident (2013-10-15) 1 commit

378 - (merged to 'next' on 2013-10-18 at 8f4b8b7)

379 - + split_ident: parse timestamp from end of line

380 -

381 - Make the fall-back parsing of commit objects with broken author or

382 - committer lines more robust to pick up the timestamps.

499 +* nd/gc-lock-against-each-other (2013-10-18) 1 commit

500 + (merged to 'next' on 2013-10-28 at 14bd458)

501 + + gc: remove gc.pid file at end of execution

502

503 Will merge to 'master'.

504

505

387 -* sg/prompt-svn-remote-fix (2013-10-15) 1 commit

388 - (merged to 'next' on 2013-10-18 at 20b47eb)

389 - + bash prompt: don't use '+=' operator in show upstream code path

506 +* fc/styles (2013-10-16) 7 commits

507 + (merged to 'next' on 2013-10-28 at cf592ed)

508 + + block-sha1/sha1.c: have SP around arithmetic operators

509 + + base85.c: have SP around arithmetic operators

510 + + archive.c: have SP around arithmetic operators

511 + + alloc.c: have SP around arithmetic operators

512 + + abspath.c: have SP around arithmetic operators

513 + + alias: have SP around arithmetic operators

514 + + C: have space around && and || operators

515

391 - Bash portability fix.

516 + C coding style fixes.

517

518 Will merge to 'master'.

519

520

521 * sg/t3600-nul-sha1-fix (2013-10-16) 1 commit

397 - - t3600: fix broken "choking git rm" test

522 + (merged to 'next' on 2013-10-28 at ac4b703)

523 + + t3600: fix broken "choking git rm" test

524

399 - Will merge to 'next'.

525 + Will merge to 'master'.

526

527

528 * ak/submodule-foreach-quoting (2013-09-27) 1 commit

@@ -424,15 +550,6 @@ of the repositories listed at

550 Will cook in 'next' for the rest of this cycle.

551

552

427 -* ew/keepalive (2013-10-16) 2 commits

428 - (merged to 'next' on 2013-10-16 at 56fd9f3)

429 - + http: use curl's tcp keepalive if available

430 - (merged to 'next' on 2013-10-14 at 24d786f)

431 - + http: enable keepalive on TCP sockets

432 -

433 - Will merge to 'master'.

434 -

435 -

553 * jk/http-auth-redirects (2013-10-24) 10 commits

554 (merged to 'next' on 2013-10-24 at 4bebb66)

555 + http.c: Spell the null pointer as NULL

@@ -454,13 +571,14 @@ of the repositories listed at

571

572

573 * jl/submodule-mv (2013-10-13) 1 commit

457 - - mv: Fix spurious warning when moving a file in presence of submodules

574 + (merged to 'next' on 2013-10-28 at 8dc9b31)

575 + + mv: Fix spurious warning when moving a file in presence of submodules

576

577 Moving a regular file in a repository with a .gitmodules file was

578 producing a warning 'Could not find section in .gitmodules where

579 path=<filename>'.

580

463 - Will merge to 'next'.

581 + Will merge to 'master'.

582

583

584 * kb/fast-hashmap (2013-10-22) 12 commits

@@ -487,16 +605,6 @@ of the repositories listed at

605 Will merge to 'next'.

606

607

490 -* jc/revision-range-unpeel (2013-10-15) 1 commit

491 - (merged to 'next' on 2013-10-16 at d04ddfe)

492 - + revision: do not peel tags used in range notation

493 -

494 - "git rev-list --objects ^v1.0^ v1.0" gave v1.0 tag itself in the

495 - output, but "git rev-list --objects v1.0^..v1.0" did not.

496 -

497 - Will merge to 'master'.

498 -

499 -

608 * jc/upload-pack-send-symref (2013-10-22) 10 commits

609 (merged to 'next' on 2013-10-23 at 8ef5660)

610 + t5570: Update for clone-progress-to-stderr branch

@@ -522,41 +630,35 @@ of the repositories listed at

630 Will merge to 'master'.

631

632

525 -* jx/relative-path-regression-fix (2013-10-14) 3 commits

526 - (merged to 'next' on 2013-10-18 at b4af45f)

527 - + Use simpler relative_path when set_git_dir

528 - (merged to 'next' on 2013-10-14 at 704b9ee)

529 - + relative_path should honor dos-drive-prefix

530 - + test: use unambigous leading path (/foo) for MSYS

531 -

532 - Will merge to 'master' and later to 'maint'.

533 -

534 -

633 * jn/add-2.0-u-A-sans-pathspec (2013-04-26) 1 commit

536 - - git add: -u/-A now affects the entire working tree

634 + (merged to 'next' on 2013-10-28 at d8cdf30)

635 + + git add: -u/-A now affects the entire working tree

636

538 - Will merge to and cook in 'next' until Git 2.0.

637 + Will cook in 'next' until Git 2.0.

638

639

640 * jc/core-checkstat-2.0 (2013-05-06) 1 commit

542 - - core.statinfo: remove as promised in Git 2.0

641 + (merged to 'next' on 2013-10-28 at f1bec96)

642 + + core.statinfo: remove as promised in Git 2.0

643

544 - Will merge to and cook in 'next' until Git 2.0.

644 + Will cook in 'next' until Git 2.0.

645

646

647 * jc/push-2.0-default-to-simple (2013-06-18) 1 commit

548 - - push: switch default from "matching" to "simple"

648 + (merged to 'next' on 2013-10-28 at 3153a9e)

649 + + push: switch default from "matching" to "simple"

650

550 - Will merge to and cook in 'next' until Git 2.0.

651 + Will cook in 'next' until Git 2.0.

652

653

654 * jc/add-2.0-ignore-removal (2013-04-22) 1 commit

554 - - git add <pathspec>... defaults to "-A"

655 + (merged to 'next' on 2013-10-28 at 5fd76ec)

656 + + git add <pathspec>... defaults to "-A"

657

658 Updated endgame for "git add <pathspec>" that defaults to "--all"

659 aka "--no-ignore-removal".

660

559 - Will merge to and cook in 'next' until Git 2.0.

661 + Will cook in 'next' until Git 2.0.

662

663

664 * jc/hold-diff-remove-q-synonym-for-no-deletion (2013-07-19) 1 commit

What's cooking (2013/10 #07)