26aab44c5e · matheusbsbs/matheus-bagliano

@@ -1,83 +1,148 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Oct 2013, #03; Wed, 16)

4 -X-master-at: 1d25dd416f08f39042d23340db380f28abb81962

5 -X-next-at: 748b636b89b812d224df614a3624ce2c0b67b367

3 +Subject: What's cooking in git.git (Oct 2013, #04; Fri, 18)

4 +X-master-at: db9bdfbeb044f73a01f6325f4ad61413666a2ce0

5 +X-next-at: a09e2a8521091b0cc2a18d124507050f20dee1d0

6

7 -What's cooking in git.git (Oct 2013, #03; Wed, 16)

7 +What's cooking in git.git (Oct 2013, #04; Fri, 18)

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 -I think I correctly inherited all the topics Jonathan kept track of

15 -during my absence (big thanks to Jonathan); if a topic that has been

16 -in his tree is missing please holler. I am chewing through the list

17 -backlog but still have a long way to go.

18 -

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

15 of the repositories listed at

16

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

18

19 --------------------------------------------------

25 -[New Topics]

20 +[Graduated to "master"]

21

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

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

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

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

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

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

33 - - alias: have SP around arithmetic operators

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

22 +* es/name-hash-no-trailing-slash-in-dirs (2013-09-17) 4 commits

23 + (merged to 'next' on 2013-09-20 at 9633d9a)

24 + + dir: revert work-around for retired dangerous behavior

25 + + name-hash: stop storing trailing '/' on paths in index_state.dir_hash

26 + + employ new explicit "exists in index?" API

27 + + name-hash: refactor polymorphic index_name_exists()

28

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

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

38 - second one) and I may either send them or drop some of them if they

39 - turn out to conflict with other work in flight---I still haven't

40 - caught up with the backlog and do not know.

29 + Clean up the internal of the name-hash mechanism used to work

30 + around case insensitivity on some filesystems to cleanly fix a

31 + long-standing API glitch where the caller of cache_name_exists()

32 + that ask about a directory with a counted string was required to

33 + have '/' at one location past the end of the string.

34

35

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

44 - - remote: do not copy "origin" string literal

36 +* jc/checkout-detach-doc (2013-09-11) 1 commit

37 + (merged to 'next' on 2013-09-17 at 438cf13)

38 + + checkout: update synopsys and documentation on detaching HEAD

39 +

40 + "git checkout [--detach] <commit>" was listed poorly in the

41 + synopsis section of its documentation.

42

46 - Will merge to 'next'.

43

44 +* jc/reflog-doc (2013-06-19) 1 commit

45 + (merged to 'next' on 2013-09-25 at 4eb0c14)

46 + + setup_reflog_action: document the rules for using GIT_REFLOG_ACTION

47

49 -* jk/split-broken-ident (2013-10-15) 2 commits

50 - - SQUASH??? remove reverse scan to simplify the logic

51 - - split_ident: parse timestamp from end of line

48 + Document rules to use GIT_REFLOG_ACTION variable in the scripted

49 + Porcelain. git-rebase--interactive locally violates them, but it

50 + is a leaf user that does not call out to or dot-source other

51 + scripts, so it does not urgently need to be fixed.

52

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

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

53

56 - Will merge to 'next', perhaps after dropping the top one.

54 +* jk/clone-progress-to-stderr (2013-09-18) 3 commits

55 + (merged to 'next' on 2013-09-25 at 137af9e)

56 + + clone: always set transport options

57 + + clone: treat "checking connectivity" like other progress

58 + + clone: send diagnostic messages to stderr

59 +

60 + Some progress and diagnostic messages from "git clone" were

61 + incorrectly sent to the standard output stream, not to the standard

62 + error stream.

63 +

64

65 +* jk/format-patch-from (2013-09-20) 1 commit

66 + (merged to 'next' on 2013-09-20 at 0506530)

67 + + format-patch: print in-body "From" only when needed

68

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

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

69 + "format-patch --from=<whom>" forgot to omit unnecessary in-body

70 + from line, i.e. when <whom> is the same as the real author.

71 +

72 +

73 +* jk/trailing-slash-in-pathspec (2013-09-13) 2 commits

74 + (merged to 'next' on 2013-09-17 at 18fe277)

75 + + reset: handle submodule with trailing slash

76 + + rm: re-use parse_pathspec's trailing-slash removal

77 +

78 + Code refactoring.

79

62 - Bash portability fix.

80 +

81 +* lc/filter-branch-too-many-refs (2013-09-12) 1 commit

82 + (merged to 'next' on 2013-09-17 at 31cd01a)

83 + + Allow git-filter-branch to process large repositories with lots of branches.

84 +

85 + "git filter-branch" in a repository with many refs blew limit of

86 + command line length.

87 +

88 +

89 +* sb/repack-in-c (2013-09-17) 3 commits

90 + (merged to 'next' on 2013-09-25 at 7c47036)

91 + + repack: improve warnings about failure of renaming and removing files

92 + + repack: retain the return value of pack-objects

93 + + repack: rewrite the shell script in C

94 +

95 + Rerolled, and I think it is in a reasonably good shape.

96 +

97 +--------------------------------------------------

98 +[New Topics]

99 +

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

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

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

103 +

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

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

106 + branch, pretended as if "git checkout -t -b topic remote/$r/topic"

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

108 + implemented for "git checkout topic --".

109

110 Will merge to 'next'.

111

112

67 -* sc/doc-howto-dumb-http (2013-10-16) 1 commit

68 - - doc/howto: warn about (dumb)http server document being too old

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

114 + - graph: fix coloring around octopus merges

115

116 Will merge to 'next'.

117

118

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

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

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

120 + - gc: remove gc.pid file at end of execution

121

122 Will merge to 'next'.

123

124 --------------------------------------------------

125 [Stalled]

126

127 +* np/pack-v4 (2013-09-18) 90 commits

128 + - packv4-parse.c: add tree offset caching

129 + - t1050: replace one instance of show-index with verify-pack

130 + - index-pack, pack-objects: allow creating .idx v2 with .pack v4

131 + - unpack-objects: decode v4 trees

132 + - unpack-objects: allow to save processed bytes to a buffer

133 + - ...

134 +

135 + Nico and Duy advancing the eternal vaporware pack-v4. This is here

136 + primarily for wider distribution of the preview edition.

137 +

138 +

139 +* sc/doc-howto-dumb-http (2013-10-16) 1 commit

140 + . doc/howto: warn about (dumb)http server document being too old

141 +

142 + The new text needs to go somewhere in the body of the document,

143 + not before the title line.

144 +

145 +

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

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

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

@@ -166,6 +231,54 @@ of the repositories listed at

231 --------------------------------------------------

232 [Cooking]

233

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

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

236 + - base85.c: have SP around arithmetic operators

237 + - archive.c: have SP around arithmetic operators

238 + - alloc.c: have SP around arithmetic operators

239 + - abspath.c: have SP around arithmetic operators

240 + - alias: have SP around arithmetic operators

241 + - C: have space around && and || operators

242 +

243 + C coding style fixes. The ones near the tip have not been sent to

244 + the list yet (they cover the same kind of style violation as the

245 + second one) and I may either send them or drop some of them if they

246 + turn out to conflict with other work in flight---I still haven't

247 + caught up with the backlog and do not know.

248 +

249 +

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

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

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

253 +

254 + Will merge to 'master'.

255 +

256 +

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

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

259 + + split_ident: parse timestamp from end of line

260 +

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

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

263 +

264 + Will merge to 'master'.

265 +

266 +

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

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

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

270 +

271 + Bash portability fix.

272 +

273 + Will merge to 'master'.

274 +

275 +

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

277 + - t3600: fix broken "choking git rm" test

278 +

279 + Will merge to 'next'.

280 +

281 +

282 * mg/more-textconv (2013-05-10) 7 commits

283 (merged to 'next' on 2013-10-14 at 8a12490)

284 + grep: honor --textconv for the case rev:path

@@ -179,6 +292,8 @@ of the repositories listed at

292 Make "git grep" and "git show" pay attention to --textconv when

293 dealing with blob objects.

294

295 + Will merge to 'master'.

296 +

297

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

299 (merged to 'next' on 2013-10-14 at d77c5f1)

@@ -209,6 +324,8 @@ of the repositories listed at

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

325 + http: enable keepalive on TCP sockets

326

327 + Will merge to 'master'.

328 +

329

330 * hu/cherry-pick-previous-branch (2013-10-10) 1 commit

331 (merged to 'next' on 2013-10-14 at 090934f)

@@ -218,11 +335,15 @@ of the repositories listed at

335

336 Could use a follow-up to handle '-' after argv[1] better.

337

338 + Will merge to 'master'.

339 +

340

341 * jc/pack-objects (2013-02-04) 1 commit

342 (merged to 'next' on 2013-10-14 at 8e8feb6)

343 + pack-objects: shrink struct object_entry

344

345 + Will merge to 'master'.

346 +

347

348 * jc/prompt-upstream (2013-10-14) 1 commit

349 (merged to 'next' on 2013-10-14 at 270ef7b)

@@ -230,6 +351,8 @@ of the repositories listed at

351

352 An enhancement to the GIT_PS1_SHOWUPSTREAM facility.

353

354 + Will merge to 'master'.

355 +

356

357 * jk/http-auth-redirects (2013-10-14) 9 commits

358 - remote-curl: rewrite base url from info/refs redirects

@@ -256,41 +379,53 @@ of the repositories listed at

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

380 path=<filename>'.

381

259 - jrneider: "The test can use a little cleanup. Otherwise looks good".

382 + Will merge to 'next'.

383 +

384

385 +* yt/shortened-rename (2013-10-18) 2 commits

386 + - SQUASH??? style fixes and s/omit/shorten/ where appropriate

387 + - diff.c: keep arrow(=>) on show_stats()'s shortened filename part to make rename visible

388

262 -* yt/shortened-rename (2013-10-13) 1 commit

263 - - diff.c: keep arrow(=>) on show_stats()'s shortened filename part to make rename visible.

389 + Attempts to give more weight on the fact that a filepair represents

390 + a rename than showing substring of the actual path when diffstat

391 + lines are not wide enough.

392

265 - Reroll v6 hasn't been picked up yet.

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

394

395

396 * bc/gnome-keyring (2013-10-16) 16 commits

269 - - contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyring

270 - - contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring

271 - - contrib/git-credential-gnome-keyring.c: report failure to store password

272 - - contrib/git-credential-gnome-keyring.c: use glib messaging functions

273 - - contrib/git-credential-gnome-keyring.c: use glib memory allocation functions

274 - - contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords

275 - - contrib/git-credential-gnome-keyring.c: use secure memory functions for passwds

276 - - contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()

277 - - contrib/git-credential-gnome-keyring.c: set Gnome application name

278 - - contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing

279 - - contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_t

280 - - contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectly

281 - - contrib/git-credential-gnome-keyring.c: add static where applicable

282 - - contrib/git-credential-gnome-keyring.c: *style* use "if ()" not "if()" etc.

283 - - contrib/git-credential-gnome-keyring.c: remove unused die() function

284 - - contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations

397 + (merged to 'next' on 2013-10-18 at 25024aa)

398 + + contrib/git-credential-gnome-keyring.c: support really ancient gnome-keyring

399 + + contrib/git-credential-gnome-keyring.c: support ancient gnome-keyring

400 + + contrib/git-credential-gnome-keyring.c: report failure to store password

401 + + contrib/git-credential-gnome-keyring.c: use glib messaging functions

402 + + contrib/git-credential-gnome-keyring.c: use glib memory allocation functions

403 + + contrib/git-credential-gnome-keyring.c: use secure memory for reading passwords

404 + + contrib/git-credential-gnome-keyring.c: use secure memory functions for passwds

405 + + contrib/git-credential-gnome-keyring.c: use gnome helpers in keyring_object()

406 + + contrib/git-credential-gnome-keyring.c: set Gnome application name

407 + + contrib/git-credential-gnome-keyring.c: ensure buffer is non-empty before accessing

408 + + contrib/git-credential-gnome-keyring.c: strlen() returns size_t, not ssize_t

409 + + contrib/git-credential-gnome-keyring.c: exit non-zero when called incorrectly

410 + + contrib/git-credential-gnome-keyring.c: add static where applicable

411 + + contrib/git-credential-gnome-keyring.c: *style* use "if ()" not "if()" etc.

412 + + contrib/git-credential-gnome-keyring.c: remove unused die() function

413 + + contrib/git-credential-gnome-keyring.c: remove unnecessary pre-declarations

414

415 Cleanups and tweaks for credential handling to work with ancient versions

416 of the gnome-keyring library that are still in use.

417

289 - Will merge to 'next'.

418 + Will merge to 'master'.

419

420

292 -* kb/fast-hashmap (2013-09-25) 6 commits

293 - - fixup! diffcore-rename.c: simplify finding exact renames

421 +* kb/fast-hashmap (2013-10-18) 12 commits

422 + - SQUASH??? submodule.c: do not use ce after it gets freed by remove-cache-entry

423 + - remove old hash.[ch] implementation

424 + - read-cache.c: fix memory leaks caused by removed cache entries

425 + - name-hash.c: remove cache entries instead of marking them CE_UNHASHED

426 + - name-hash.c: use new hash map implementation for cache entries

427 + - name-hash.c: remove unreferenced directory entries

428 + - name-hash.c: use new hash map implementation for directories

429 - diffcore-rename.c: use new hash map implementation

430 - diffcore-rename.c: simplify finding exact renames

431 - diffcore-rename.c: move code around to prepare for the next patch

@@ -300,9 +435,8 @@ of the repositories listed at

435 Improvements to our hash table to get it to meet the needs of the

436 msysgit fscache project, with some nice performance improvements.

437

303 - Looks promising. Needs style review and a sanity-check on the

304 - design before including in 'next'. Expecting a reroll once review

305 - settles down.

438 + Replaced with a newer reroll; the tip one needs to be replaced with

439 + the version from Jens and should come before any of them.

440

441

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

@@ -312,6 +446,8 @@ of the repositories listed at

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

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

448

449 + Will merge to 'master'.

450 +

451

452 * tg/perf-lib-test-perf-cleanup (2013-09-19) 2 commits

453 - perf-lib: add test_perf_cleanup target

@@ -323,32 +459,6 @@ of the repositories listed at

459 Holding until needed.

460

461

326 -* jk/format-patch-from (2013-09-20) 1 commit

327 - (merged to 'next' on 2013-09-20 at 0506530)

328 - + format-patch: print in-body "From" only when needed

329 -

330 - "format-patch --from=<whom>" forgot to omit unnecessary in-body

331 - from line, i.e. when <whom> is the same as the real author.

332 -

333 - Will merge to 'master'.

334 -

335 -

336 -* es/name-hash-no-trailing-slash-in-dirs (2013-09-17) 4 commits

337 - (merged to 'next' on 2013-09-20 at 9633d9a)

338 - + dir: revert work-around for retired dangerous behavior

339 - + name-hash: stop storing trailing '/' on paths in index_state.dir_hash

340 - + employ new explicit "exists in index?" API

341 - + name-hash: refactor polymorphic index_name_exists()

342 -

343 - Clean up the internal of the name-hash mechanism used to work

344 - around case insensitivity on some filesystems to cleanly fix a

345 - long-standing API glitch where the caller of cache_name_exists()

346 - that ask about a directory with a counted string was required to

347 - have '/' at one location past the end of the string.

348 -

349 - Will merge to 'master'.

350 -

351 -

462 * po/dot-url (2013-10-15) 3 commits

463 (merged to 'next' on 2013-10-15 at 312d0af)

464 + doc/cli: make "dot repository" an independent bullet point

@@ -383,91 +493,14 @@ of the repositories listed at

493 Will merge to 'master'.

494

495

386 -* jk/clone-progress-to-stderr (2013-09-18) 3 commits

387 - (merged to 'next' on 2013-09-25 at 137af9e)

388 - + clone: always set transport options

389 - + clone: treat "checking connectivity" like other progress

390 - + clone: send diagnostic messages to stderr

391 -

392 - Some progress and diagnostic messages from "git clone" were

393 - incorrectly sent to the standard output stream, not to the standard

394 - error stream.

395 -

396 - Will merge to 'master'.

397 -

398 -

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

400 - - Use simpler relative_path when set_git_dir

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

498 + + Use simpler relative_path when set_git_dir

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

500 + relative_path should honor dos-drive-prefix

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

502

405 - Waiting for the review to settle.

406 -

407 -

408 -* jc/checkout-detach-doc (2013-09-11) 1 commit

409 - (merged to 'next' on 2013-09-17 at 438cf13)

410 - + checkout: update synopsys and documentation on detaching HEAD

411 -

412 - "git checkout [--detach] <commit>" was listed poorly in the

413 - synopsis section of its documentation.

414 -

415 - Will merge to 'master'.

416 -

417 -

418 -* jk/trailing-slash-in-pathspec (2013-09-13) 2 commits

419 - (merged to 'next' on 2013-09-17 at 18fe277)

420 - + reset: handle submodule with trailing slash

421 - + rm: re-use parse_pathspec's trailing-slash removal

422 -

423 - Code refactoring.

424 -

425 - Will merge to 'master'.

426 -

427 -

428 -* lc/filter-branch-too-many-refs (2013-09-12) 1 commit

429 - (merged to 'next' on 2013-09-17 at 31cd01a)

430 - + Allow git-filter-branch to process large repositories with lots of branches.

431 -

432 - "git filter-branch" in a repository with many refs blew limit of

433 - command line length.

434 -

435 - Will merge to 'master'.

436 -

437 -

438 -* np/pack-v4 (2013-09-18) 90 commits

439 - - packv4-parse.c: add tree offset caching

440 - - t1050: replace one instance of show-index with verify-pack

441 - - index-pack, pack-objects: allow creating .idx v2 with .pack v4

442 - - unpack-objects: decode v4 trees

443 - - unpack-objects: allow to save processed bytes to a buffer

444 - - ...

445 -

446 - Nico and Duy advancing the eternal vaporware pack-v4. This is here

447 - primarily for wider distribution of the preview edition.

448 -

449 -

450 -* sb/repack-in-c (2013-09-17) 3 commits

451 - (merged to 'next' on 2013-09-25 at 7c47036)

452 - + repack: improve warnings about failure of renaming and removing files

453 - + repack: retain the return value of pack-objects

454 - + repack: rewrite the shell script in C

455 -

456 - Rerolled, and I think it is in a reasonably good shape.

457 -

458 - Will merge to 'master'.

459 -

460 -

461 -* jc/reflog-doc (2013-06-19) 1 commit

462 - (merged to 'next' on 2013-09-25 at 4eb0c14)

463 - + setup_reflog_action: document the rules for using GIT_REFLOG_ACTION

464 -

465 - Document rules to use GIT_REFLOG_ACTION variable in the scripted

466 - Porcelain. git-rebase--interactive locally violates them, but it

467 - is a leaf user that does not call out to or dot-source other

468 - scripts, so it does not urgently need to be fixed.

469 -

470 - Will merge to 'master'.

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

504

505

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

What's cooking (2013/10 #04)