2eb21e8ca9 · 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 (Oct 2013, #04; Fri, 18)

4 -X-master-at: db9bdfbeb044f73a01f6325f4ad61413666a2ce0

5 -X-next-at: a09e2a8521091b0cc2a18d124507050f20dee1d0

3 +Subject: What's cooking in git.git (Oct 2013, #05; Wed, 23)

4 +X-master-at: 3d092bfc6f2d9a998967979f926c661e9762601c

5 +X-next-at: 1c32b8d241eeeb98707f52c99ac71d905c99b673

6

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

7 +What's cooking in git.git (Oct 2013, #05; Wed, 23)

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

9

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

@@ -19,108 +19,136 @@ of the repositories listed at

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

20 [Graduated to "master"]

21

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()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

40

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.

41 + Cleanups and tweaks for credential handling to work with ancient versions

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

43

44

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

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

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

47 + + cherry-pick: handle "-" after parsing options

48

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

41 - synopsis section of its documentation.

49 + "git cherry-pick" without further options would segfault.

50

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

52

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

53

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.

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

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

56 + + pack-objects: shrink struct object_entry

57

58

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 +* jc/prompt-upstream (2013-10-14) 1 commit

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

61 + + git-prompt.sh: optionally show upstream branch name

62

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 + An enhancement to the GIT_PS1_SHOWUPSTREAM facility.

64

65

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

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

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

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

69 + + grep: allow to use textconv filters

70 + + t7008: demonstrate behavior of grep with textconv

71 + + cat-file: do not die on --textconv without textconv filters

72 + + show: honor --textconv for blobs

73 + + diff_opt: track whether flags have been set explicitly

74 + + t4030: demonstrate behavior of show with textconv

75

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.

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

77 + dealing with blob objects.

78

79

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

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

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

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

83 + (merged to 'next' on 2013-09-20 at 6a12786)

84 + + config doc: update dot-repository notes

85 + + doc: command line interface (cli) dot-repository dwimmery

86

78 - Code refactoring.

87 + Explain how '.' can be used to refer to the "current repository"

88 + in the documentation.

89

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

91 +[New Topics]

92

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.

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

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

95

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

86 - command line length.

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

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

98 + such a path.

99

100 + Will merge to 'next'.

101

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

102

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

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

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

105

97 ---------------------------------------------------

98 -[New Topics]

106 + The codepath that send_pack() calls pack_objects() mistakenly

107 + closed the same file descriptor twice, leading to potentially

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

109

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 --"

110 + Will merge to 'next'.

111 + Needs to be merged later to 'maint'.

112

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 --".

113 +

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

115 + - Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags

116 +

117 + All callers to parse_pathspec() must choose between getting no

118 + pathspec or one path that is limited to the current directory

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

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

121

122 Will merge to 'next'.

123

124

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

114 - - graph: fix coloring around octopus merges

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

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

127

128 Will merge to 'next'.

129

130

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

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

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

132 + - Documentation: revamp gitk(1)

133 +

134 + Will merge to 'next'.

135 +

136 +

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

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

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

140

141 Will merge to 'next'.

142

143 +

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

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

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

147 +

148 + Finishing touches to update documentation.

149 +

150 + Will merge to 'master'.

151 +

152 --------------------------------------------------

153 [Stalled]

154

@@ -143,6 +171,27 @@ of the repositories listed at

171 not before the title line.

172

173

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

175 + - perf-lib: add test_perf_cleanup target

176 + - perf-lib: split starting the test from the execution

177 +

178 + Add test_perf_cleanup shell function to the perf suite, that allows

179 + the script writers to define a test with a clean-up action.

180 +

181 + Holding until needed.

182 +

183 +

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

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

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

187 +

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

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

190 + lines are not wide enough.

191 +

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

193 +

194 +

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

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

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

@@ -231,6 +280,31 @@ of the repositories listed at

280 --------------------------------------------------

281 [Cooking]

282

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

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

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

286 +

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

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

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

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

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

292 +

293 + Will merge to 'next'.

294 +

295 +

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

297 + - graph: fix coloring around octopus merges

298 +

299 + Will merge to 'next'.

300 +

301 +

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

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

304 +

305 + Will merge to 'next'.

306 +

307 +

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

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

310 - base85.c: have SP around arithmetic operators

@@ -242,9 +316,9 @@ of the repositories listed at

316

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

318 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.

319 + second one) and I should send them to the list.

320 +

321 + Will merge to 'next'.

322

323

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

@@ -279,22 +353,6 @@ of the repositories listed at

353 Will merge to 'next'.

354

355

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

285 - + grep: allow to use textconv filters

286 - + t7008: demonstrate behavior of grep with textconv

287 - + cat-file: do not die on --textconv without textconv filters

288 - + show: honor --textconv for blobs

289 - + diff_opt: track whether flags have been set explicitly

290 - + t4030: demonstrate behavior of show with textconv

291 -

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 -

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

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

358 + submodule foreach: skip eval for more than one argument

@@ -317,6 +375,8 @@ of the repositories listed at

375 so that scripts that used multiple arguments but added their own

376 extra layer of quoting are not broken.

377

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

379 +

380

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

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

@@ -327,33 +387,6 @@ of the repositories listed at

387 Will merge to 'master'.

388

389

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

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

332 - + cherry-pick: handle "-" after parsing options

333 -

334 - "git cherry-pick" without further options would segfault.

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)

350 - + git-prompt.sh: optionally show upstream branch name

351 -

352 - An enhancement to the GIT_PS1_SHOWUPSTREAM facility.

353 -

354 - Will merge to 'master'.

355 -

356 -

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

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

392 - remote-curl: store url as a strbuf

@@ -382,44 +415,7 @@ of the repositories listed at

415 Will merge to 'next'.

416

417

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 -

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 -

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

394 -

395 -

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

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 -

418 - Will merge to 'master'.

419 -

420 -

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

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

419 - remove old hash.[ch] implementation

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

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

@@ -431,12 +427,16 @@ of the repositories listed at

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

428 - buitin/describe.c: use new hash map implementation

429 - add a hashtable implementation that supports O(1) removal

430 + - submodule: don't access the .gitmodules cache entry after removing it

431

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

433 msysgit fscache project, with some nice performance improvements.

434

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.

435 + The preparatory clean-up to submodule from Jens is at the bottom. I

436 + also squashed in a fix-up by Karsten found at $gmane/236468 (please

437 + double-check the result).

438 +

439 + Will merge to 'next'.

440

441

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

@@ -449,30 +449,11 @@ of the repositories listed at

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

454 - - perf-lib: split starting the test from the execution

455 -

456 - Add test_perf_cleanup shell function to the perf suite, that allows

457 - the script writers to define a test with a clean-up action.

458 -

459 - Holding until needed.

460 -

461 -

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

465 - (merged to 'next' on 2013-09-20 at 6a12786)

466 - + config doc: update dot-repository notes

467 - + doc: command line interface (cli) dot-repository dwimmery

468 -

469 - Explain how '.' can be used to refer to the "current repository"

470 - in the documentation.

471 -

472 - Will merge to 'master'.

473 -

474 -

475 -* jc/upload-pack-send-symref (2013-09-17) 7 commits

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

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

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

455 + + Merge branch 'jk/clone-progress-to-stderr' into jc/upload-pack-send-symref

456 + + t5570: Update for symref capability

457 (merged to 'next' on 2013-10-16 at eb1ae25)

458 + clone: test the new HEAD detection logic

459 + connect: annotate refs with their symref information in get_remote_head()

@@ -506,19 +487,19 @@ of the repositories listed at

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

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

489

509 - Will cook in 'next' until Git 2.0.

490 + Will merge to and cook in 'next' until Git 2.0.

491

492

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

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

495

515 - Will cook in 'next' until Git 2.0.

496 + Will merge to and cook in 'next' until Git 2.0.

497

498

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

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

501

521 - Will cook in 'next' until Git 2.0.

502 + Will merge to and cook in 'next' until Git 2.0.

503

504

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

@@ -527,26 +508,10 @@ of the repositories listed at

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

509 aka "--no-ignore-removal".

510

530 - Will cook in 'next' until Git 2.0.

511 + Will merge to and cook in 'next' until Git 2.0.

512

513

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

515 - diff: remove "diff-files -q" in a version of Git in a distant future

516

536 - Will cook in 'next' until a distant future.

537 -

538 ---------------------------------------------------

539 -[Discarded]

540 -

541 -* jc/pull-training-wheel (2013-07-19) 1 commit

542 - (merged to 'next' on 2013-08-28 at c39bd15)

543 - + pull: require choice between rebase/merge on non-fast-forward pull

544 -

545 - Make "git pull" (without arguments that say what branch to

546 - integrate from where) refuse with "it does not fast forward; choose

547 - between 'pull --merge' and 'pull --rebase'".

548 -

549 - This topic has been reverted from 'next'. Will wait for the

550 - conclusion of the discussion to seek a more user-friendly

551 - alternative; it is likely that it will be based on the simpler

552 - approach Felipe posted earlier.

517 + Will merge to and cook in 'next' until a distant future.

What's cooking (2013/10 #05)