dadb3274bc · matheusbsbs/matheus-bagliano

@@ -1,25 +1,18 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Mar 2014, #05; Mon, 24)

4 -X-master-at: 3f09db07b3dc0758756fad73c96abd0e47cbcd1b

5 -X-next-at: f5e1d547771ba4cba473a0195e52a3c9bceeb5f9

3 +Subject: What's cooking in git.git (Mar 2014, #06; Tue, 25)

4 +X-master-at: d393d140b5656e608b332c00ea3b14f9a060d604

5 +X-next-at: 2ddfaae461cfeaf6df645d1978edc11df0e4914b

6

7 -What's cooking in git.git (Mar 2014, #05; Mon, 24)

7 +What's cooking in git.git (Mar 2014, #06; Tue, 25)

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 -More topics merged to 'master', some of which have been cooking

15 -before the v1.9.0 final release, many of them fallouts from GSoC

16 -microprojects. Many topics that have been marked to be discarded

17 -are finally discarded.

18 -

19 -There seems to be a crasher somewhere in the new pack bitmap

20 -codepath that was introduced recently. I am hoping that the root

21 -cause is found and fixed soonish. Other than that, things look more

22 -or less calm on the 'next' and up.

14 +More topics merged to 'master', many of which are fallouts from GSoC

15 +microprojects.

16

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

18 of the repositories listed at

@@ -29,173 +22,152 @@ of the repositories listed at

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

23 [Graduated to "master"]

24

32 -* dk/skip-prefix-scan-only-once (2014-03-03) 1 commit

33 - (merged to 'next' on 2014-03-14 at ff375fc)

34 - + skip_prefix(): scan prefix only once

35 -

36 - Update implementation of skip_prefix() to scan only once; given

37 - that most "prefix" arguments to the inline function are constant

38 - strings whose strlen() can be determined at the compile time, this

39 - might actually make things worse with a compiler with sufficient

40 - intelligence.

41 -

42 -

43 -* es/sh-i18n-envsubst (2014-03-12) 1 commit

44 - (merged to 'next' on 2014-03-14 at e4d5603)

45 - + sh-i18n--envsubst: retire unused string_list_member()

46 -

47 -

48 -* jc/stash-pop-not-popped (2014-02-26) 1 commit

49 - (merged to 'next' on 2014-03-14 at 9ba1de8)

50 - + stash pop: mention we did not drop the stash upon failing to apply

51 -

52 - "stash pop", upon failing to apply the stash, refrains from

53 - discarding the stash to avoid information loss. Be more explicit

54 - in the error message.

55 -

56 - The wording may want to get a bit more bikeshedding.

25 +* bb/diff-no-index-dotdot (2014-03-19) 2 commits

26 + (merged to 'next' on 2014-03-20 at 352f48c)

27 + + diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()

28 + + diff-no-index: rename read_directory()

29

30

59 -* jk/shallow-update-fix (2014-03-17) 3 commits

60 - (merged to 'next' on 2014-03-17 at 011942e)

61 - + shallow: verify shallow file after taking lock

62 - (merged to 'next' on 2014-03-12 at ce5abbf)

63 - + shallow: automatically clean up shallow tempfiles

64 - + shallow: use stat_validity to check for up-to-date file

31 +* cp/am-patch-format-doc (2014-03-17) 2 commits

32 + (merged to 'next' on 2014-03-17 at 7437c77)

33 + + Documentation/git-am: typofix

34 + (merged to 'next' on 2014-03-12 at 17c3ada)

35 + + Documentation/git-am: Document supported --patch-format options

36

66 - Serving objects from a shallow repository needs to write a new file

67 - to hold the temporary shallow boundaries but it was not cleaned

68 - when we exit due to die() or a signal.

37

38 +* dm/configure-iconv-locale-charset (2014-03-11) 1 commit

39 + (merged to 'next' on 2014-03-20 at 4443bfd)

40 + + configure.ac: link with -liconv for locale_charset()

41

71 -* jn/wt-status (2014-03-12) 4 commits

72 - (merged to 'next' on 2014-03-14 at 8ac862c)

73 - + wt-status: lift the artificual "at least 20 columns" floor

74 - + wt-status: i18n of section labels

75 - + wt-status: extract the code to compute width for labels

76 - + wt-status: make full label string to be subject to l10n

42

78 - Unify the codepaths that format new/modified/changed sections and

79 - conflicted paths in the "git status" output and make it possible to

80 - properly internationalize their output.

43 +* jk/lib-terminal-lazy (2014-03-14) 1 commit

44 + (merged to 'next' on 2014-03-20 at 5de832f)

45 + + t/lib-terminal: make TTY a lazy prerequisite

46

47 + The test helper lib-terminal always run an actual test_expect_* when

48 + included, which screwed up with the use of skil-all that may have to

49 + be done later.

50

83 -* lt/request-pull (2014-03-13) 6 commits

84 - (merged to 'next' on 2014-03-17 at 21a598d)

85 - + request-pull: documentation updates

86 - + request-pull: resurrect "pretty refname" feature

87 - + request-pull: test updates

88 - + request-pull: pick up tag message as before

89 - + request-pull: allow "local:remote" to specify names on both ends

90 - + request-pull: more strictly match local/remote branches

51

92 - Discard the accumulated "heuristics" to guess from which branch the

93 - result wants to be pulled from and make sure what the end user

94 - specified is not second-guessed by "git request-pull", to avoid

95 - mistakes.

52 +* jk/mv-submodules-fix (2014-03-17) 2 commits

53 + (merged to 'next' on 2014-03-17 at 7cae3b1)

54 + + mv: prevent mismatched data when ignoring errors.

55 + + builtin/mv: fix out of bounds write

56

57 + "git mv" that moves a submodule forgot to adjust the array that

58 + uses to keep track of which submodules were to be moved to update

59 + its configuration.

60

98 -* nd/tag-version-sort (2014-02-27) 1 commit

99 - (merged to 'next' on 2014-03-14 at 4e7f714)

100 - + tag: support --sort=<spec>

61

102 - Allow v1.9.0 sorted before v1.10.0 in "git tag --list" output.

62 +* jk/warn-on-object-refname-ambiguity (2014-03-13) 4 commits

63 + (merged to 'next' on 2014-03-17 at 3f8e98e)

64 + + rev-list: disable object/refname ambiguity check with --stdin

65 + + cat-file: restore warn_on_object_refname_ambiguity flag

66 + + cat-file: fix a minor memory leak in batch_objects

67 + + cat-file: refactor error handling of batch_objects

68

69

105 -* nd/upload-pack-shallow (2014-03-11) 1 commit

106 - (merged to 'next' on 2014-03-14 at d40b8c3)

107 - + upload-pack: send shallow info over stdin to pack-objects

70 +* mh/remove-subtree-long-pathname-fix (2014-03-13) 2 commits

71 + (merged to 'next' on 2014-03-17 at 68cc994)

72 + + entry.c: fix possible buffer overflow in remove_subtree()

73 + + checkout_entry(): use the strbuf throughout the function

74

109 - Serving objects from a shallow repository needs to write a

110 - temporary file to be used, but the serving upload-pack may not have

111 - write access to the repository which is meant to be read-only.

112 - Instead feed these temporary shallow bounds from the standard input

113 - of pack-objects so that we do not have to use a temporary file.

75 + Length limit for the pathname used when removing a path in a deep

76 + subdirectory has been removed to avoid buffer overflows.

77

78

116 -* tc/commit-dry-run-exit-status-tests (2014-02-24) 1 commit

117 - (merged to 'next' on 2014-03-12 at b839886)

118 - + demonstrate git-commit --dry-run exit code behaviour

79 +* nd/commit-editor-cleanup (2014-02-25) 3 commits

80 + (merged to 'next' on 2014-03-17 at 986605d)

81 + + commit: add --cleanup=scissors

82 + + wt-status.c: move cut-line print code out to wt_status_add_cut_line

83 + + wt-status.c: make cut_line[] const to shrink .data section a bit

84

120 ---------------------------------------------------

121 -[New Topics]

85 + "git commit --cleanup=<mode>" learned a new mode, scissors.

86

123 -* ca/doc-config-third-party (2014-03-21) 1 commit

124 - - config.txt: third-party tools may and do use their own variables

87

126 - Will merge to 'next'.

88 +* nd/indent-fix-connect-c (2014-03-13) 1 commit

89 + (merged to 'next' on 2014-03-17 at a109efc)

90 + + connect.c: SP after "}", not TAB

91

92

129 -* dw/doc-status-no-longer-shows-pound-prefix (2014-03-21) 1 commit

130 - - doc: status, remove leftover statement about '#' prefix

93 +* nd/index-pack-error-message (2014-03-17) 1 commit

94 + (merged to 'next' on 2014-03-20 at 4d722ac)

95 + + index-pack: report error using the correct variable

96

132 - Will merge to 'next'.

97 + "git index-pack" used a wrong variable to name the keep-file in an

98 + error message when the file cannot be written or closed.

99

100

135 -* js/userdiff-cc (2014-03-21) 10 commits

136 - - userdiff: have 'cpp' hunk header pattern catch more C++ anchor points

137 - - t4018: test cases showing that the cpp pattern misses many anchor points

138 - - t4018: test cases for the built-in cpp pattern

139 - - t4018: reduce test files for pattern compilation tests

140 - - t4018: convert custom pattern test to the new infrastructure

141 - - t4018: convert java pattern test to the new infrastructure

142 - - t4018: convert perl pattern tests to the new infrastructure

143 - - t4018: an infrastructure to test hunk headers

144 - - userdiff: support unsigned and long long suffixes of integer constants

145 - - userdiff: support C++ ->* and .* operators in the word regexp

101 +* rr/doc-merge-strategies (2014-03-17) 1 commit

102 + (merged to 'next' on 2014-03-20 at d31f415)

103 + + Documentation/merge-strategies: avoid hyphenated commands

104

147 - Improves the pattern to match the hunk-header for C/C++.

105 + There were a few instances of 'git-foo' remaining in the

106 + documentation that should have been spelled 'git foo'.

107

149 - Will merge to 'next'.

108

109 +* ss/test-on-mingw-rsync-path-no-absolute (2014-03-19) 1 commit

110 + (merged to 'next' on 2014-03-20 at 2b7b95d)

111 + + t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync

112

152 -* dp/makefile-charset-lib-doc (2014-03-23) 1 commit

153 - - Makefile: describe CHARSET_LIB better

113

155 - Will merge to 'next'.

114 +* us/printf-not-echo (2014-03-18) 2 commits

115 + (merged to 'next' on 2014-03-20 at 41205c8)

116 + + test-lib.sh: do not "echo" caller-supplied strings

117 + + rebase -i: do not "echo" random user-supplied strings

118

119 + "rebase -i" produced a broken insn sheet when the title of a commit

120 + happened to contain '\n' (or ended with '\c') due to a careless use

121 + of 'echo'.

122

158 -* ib/rev-parse-parseopt-argh (2014-03-24) 5 commits

159 - - parse-options: make sure argh string does not have SP or _

160 - - update-index: teach --cacheinfo a new syntax "mode,sha1,path"

161 - - parse-options: multi-word argh should use dash to separate words

162 - - t1502: protect runs of SPs used in the indentation

163 - - rev-parse --parseopt: option argument name hints

123 +--------------------------------------------------

124 +[New Topics]

125

165 - Teaches the "rev-parse --parseopt" mechanism used by scripted

166 - Porcelains to parse command line options and give help text how to

167 - supply argv-help (the placeholder string for an option parameter,

168 - e.g. "key-id" in "--gpg-sign=<key-id>").

126 +* jk/tests-cleanup (2014-03-21) 12 commits

127 + - t0001: drop subshells just for "cd"

128 + - t0001: drop useless subshells

129 + - t0001: use test_must_fail

130 + - t0001: use test_config_global

131 + - t0001: use test_path_is_*

132 + - t0001: make symlink reinit test more careful

133 + - t: prefer "git config --file" to GIT_CONFIG

134 + - t: prefer "git config --file" to GIT_CONFIG with test_must_fail

135 + - t: stop using GIT_CONFIG to cross repo boundaries

136 + - t: drop useless sane_unset GIT_* calls

137 + - t/test-lib: drop redundant unset of GIT_CONFIG

138 + - t/Makefile: stop setting GIT_CONFIG

139 + (this branch uses dt/tests-with-env-not-subshell.)

140

141 Will merge to 'next'.

142

143 +--------------------------------------------------

144 +[Stalled]

145

173 -* rs/pickaxe-i (2014-03-24) 10 commits

174 - - pickaxe: simplify kwset loop in contains()

175 - - pickaxe: call strlen only when necessary in diffcore_pickaxe_count()

176 - - pickaxe: move pickaxe() after pickaxe_match()

177 - - pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()

178 - - pickaxe: honor -i when used with -S and --pickaxe-regex

179 - - t4209: use helper functions to test --author

180 - - t4209: use helper functions to test --grep

181 - - t4209: factor out helper function test_log_icase()

182 - - t4209: factor out helper function test_log()

183 - - t4209: set up expectations up front

146 +* tr/merge-recursive-index-only (2014-02-05) 3 commits

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

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

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

150 + (this branch is used by tr/remerge-diff.)

151

185 - Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S

186 - to be used together and work as expected to perform a pickaxe

187 - search using case-insensitive regular expression matching.

152 + Will hold.

153

189 - Will merge to 'next'.

154

155 +* tr/remerge-diff (2014-02-26) 5 commits

156 + . log --remerge-diff: show what the conflict resolution changed

157 + . name-hash: allow dir hashing even when !ignore_case

158 + . merge-recursive: allow storing conflict hunks in index

159 + . revision: fold all merge diff variants into an enum merge_diff_mode

160 + . combine-diff: do not pass revs->dense_combined_merges redundantly

161 + (this branch uses tr/merge-recursive-index-only.)

162

192 -* an/branch-config-message (2014-03-24) 1 commit

193 - - branch.c: install_branch_config: simplify if chain

163 + "log -p" output learns a new way to let users inspect a merge

164 + commit by showing the differences between the automerged result

165 + with conflicts the person who recorded the merge would have seen

166 + and the final conflict resolution that was recorded in the merge.

167

195 - Will merge to 'next'.

168 + RFC. This latest round clashes with the kb/fast-hashmap topic in

169 + 'master'.

170

197 ---------------------------------------------------

198 -[Stalled]

171

172 * sz/mingw-index-pack-threaded (2014-03-19) 1 commit

173 - Enable index-pack threading in msysgit.

@@ -360,7 +332,7 @@ of the repositories listed at

332 parties.

333

334

363 -* jc/show-branch (2013-06-07) 5 commits

335 +* jc/show-branch (2014-03-24) 5 commits

336 - show-branch: use commit slab to represent bitflags of arbitrary width

337 - show-branch.c: remove "all_mask"

338 - show-branch.c: abstract out "flags" operation

@@ -372,17 +344,87 @@ of the repositories listed at

344 --------------------------------------------------

345 [Cooking]

346

375 -* jk/lib-terminal-lazy (2014-03-14) 1 commit

376 - (merged to 'next' on 2014-03-20 at 5de832f)

377 - + t/lib-terminal: make TTY a lazy prerequisite

347 +* ca/doc-config-third-party (2014-03-21) 1 commit

348 + (merged to 'next' on 2014-03-25 at 731e011)

349 + + config.txt: third-party tools may and do use their own variables

350 +

351 + Will merge to 'master'.

352 +

353 +

354 +* dw/doc-status-no-longer-shows-pound-prefix (2014-03-21) 1 commit

355 + (merged to 'next' on 2014-03-25 at 2683eb6)

356 + + doc: status, remove leftover statement about '#' prefix

357 +

358 + Will merge to 'master'.

359

379 - The test helper lib-terminal always run an actual test_expect_* when

380 - included, which screwed up with the use of skil-all that may have to

381 - be done later.

360 +

361 +* js/userdiff-cc (2014-03-21) 10 commits

362 + (merged to 'next' on 2014-03-25 at 8c0e585)

363 + + userdiff: have 'cpp' hunk header pattern catch more C++ anchor points

364 + + t4018: test cases showing that the cpp pattern misses many anchor points

365 + + t4018: test cases for the built-in cpp pattern

366 + + t4018: reduce test files for pattern compilation tests

367 + + t4018: convert custom pattern test to the new infrastructure

368 + + t4018: convert java pattern test to the new infrastructure

369 + + t4018: convert perl pattern tests to the new infrastructure

370 + + t4018: an infrastructure to test hunk headers

371 + + userdiff: support unsigned and long long suffixes of integer constants

372 + + userdiff: support C++ ->* and .* operators in the word regexp

373 +

374 + Improves the pattern to match the hunk-header for C/C++.

375 +

376 + Will merge to 'master'.

377 +

378 +

379 +* dp/makefile-charset-lib-doc (2014-03-23) 1 commit

380 + (merged to 'next' on 2014-03-25 at b32e3ad)

381 + + Makefile: describe CHARSET_LIB better

382

383 Will merge to 'master'.

384

385

386 +* ib/rev-parse-parseopt-argh (2014-03-24) 5 commits

387 + - parse-options: make sure argh string does not have SP or _

388 + - update-index: teach --cacheinfo a new syntax "mode,sha1,path"

389 + - parse-options: multi-word argh should use dash to separate words

390 + (merged to 'next' on 2014-03-25 at d9083ed)

391 + + t1502: protect runs of SPs used in the indentation

392 + + rev-parse --parseopt: option argument name hints

393 +

394 + Teaches the "rev-parse --parseopt" mechanism used by scripted

395 + Porcelains to parse command line options and give help text how to

396 + supply argv-help (the placeholder string for an option parameter,

397 + e.g. "key-id" in "--gpg-sign=<key-id>").

398 +

399 + Will merge the bottom part to 'master'.

400 +

401 +

402 +* rs/pickaxe-i (2014-03-24) 10 commits

403 + (merged to 'next' on 2014-03-25 at 3b6f21f)

404 + + pickaxe: simplify kwset loop in contains()

405 + + pickaxe: call strlen only when necessary in diffcore_pickaxe_count()

406 + + pickaxe: move pickaxe() after pickaxe_match()

407 + + pickaxe: merge diffcore_pickaxe_grep() and diffcore_pickaxe_count() into diffcore_pickaxe()

408 + + pickaxe: honor -i when used with -S and --pickaxe-regex

409 + + t4209: use helper functions to test --author

410 + + t4209: use helper functions to test --grep

411 + + t4209: factor out helper function test_log_icase()

412 + + t4209: factor out helper function test_log()

413 + + t4209: set up expectations up front

414 +

415 + Allow the options -i/--regexp-ignore-case, --pickaxe-regex, and -S

416 + to be used together and work as expected to perform a pickaxe

417 + search using case-insensitive regular expression matching.

418 +

419 + Will merge to 'master'.

420 +

421 +

422 +* an/branch-config-message (2014-03-24) 1 commit

423 + - branch.c: install_branch_config: simplify if chain

424 +

425 + Will merge to 'next'.

426 +

427 +

428 * ah/doc-gitk-config (2014-03-20) 1 commit

429 (merged to 'next' on 2014-03-20 at d671b60)

430 + Documentation/gitk: document the location of the configulation file

@@ -443,36 +485,6 @@ of the repositories listed at

485 - environment.c: fix constness for odb_pack_keep()

486

487

446 -* nd/index-pack-error-message (2014-03-17) 1 commit

447 - (merged to 'next' on 2014-03-20 at 4d722ac)

448 - + index-pack: report error using the correct variable

449 -

450 - Will merge to 'master'.

451 -

452 -

453 -* rr/doc-merge-strategies (2014-03-17) 1 commit

454 - (merged to 'next' on 2014-03-20 at d31f415)

455 - + Documentation/merge-strategies: avoid hyphenated commands

456 -

457 - Will merge to 'master'.

458 -

459 -

460 -* us/printf-not-echo (2014-03-18) 2 commits

461 - (merged to 'next' on 2014-03-20 at 41205c8)

462 - + test-lib.sh: do not "echo" caller-supplied strings

463 - + rebase -i: do not "echo" random user-supplied strings

464 -

465 - Will merge to 'master'.

466 -

467 -

468 -* bb/diff-no-index-dotdot (2014-03-19) 2 commits

469 - (merged to 'next' on 2014-03-20 at 352f48c)

470 - + diff-no-index: replace manual "."/".." check with is_dot_or_dotdot()

471 - + diff-no-index: rename read_directory()

472 -

473 - Will merge to 'master'.

474 -

475 -

488 * bg/rebase-off-of-previous-branch (2014-03-19) 1 commit

489 (merged to 'next' on 2014-03-21 at 916b759)

490 + rebase: allow "-" short-hand for the previous branch

@@ -481,16 +493,18 @@ of the repositories listed at

493

494

495 * dt/tests-with-env-not-subshell (2014-03-19) 1 commit

484 - - tests: use "env" to run commands with temporary env-var settings

496 + (merged to 'next' on 2014-03-25 at 19fe25f)

497 + + tests: use "env" to run commands with temporary env-var settings

498 (this branch is used by jk/tests-cleanup.)

499

487 - Will merge to 'next'.

500 + Will merge to 'master'.

501

502

503 * hs/simplify-bit-setting-in-fsck-tree (2014-03-20) 1 commit

491 - - fsck: use bitwise-or assignment operator to set flag

504 + (merged to 'next' on 2014-03-25 at 08efd68)

505 + + fsck: use bitwise-or assignment operator to set flag

506

493 - Will merge to 'next'.

507 + Will merge to 'master'.

508

509

510 * mm/status-porcelain-format-i18n-fix (2014-03-20) 2 commits

@@ -500,32 +514,9 @@ of the repositories listed at

514 Will merge to 'next' after squashing in the fixup.

515

516

503 -* ss/test-on-mingw-rsync-path-no-absolute (2014-03-19) 1 commit

504 - (merged to 'next' on 2014-03-20 at 2b7b95d)

505 - + t5510: Do not use $(pwd) when fetching / pushing / pulling via rsync

506 -

507 - Will merge to 'master'.

508 -

509 -

510 -* ap/remote-hg-skip-null-bookmarks (2014-03-21) 2 commits

511 - - SQUASH???

512 - - remote-hg: do not fail on invalid bookmarks

513 -

514 - Will merge to 'next' after squashing in the fix.

515 - Thanks Torsten for testing.

516 -

517 -

518 -* mh/remove-subtree-long-pathname-fix (2014-03-13) 2 commits

519 - (merged to 'next' on 2014-03-17 at 68cc994)

520 - + entry.c: fix possible buffer overflow in remove_subtree()

521 - + checkout_entry(): use the strbuf throughout the function

522 -

523 - Will merge to 'master'.

524 -

525 -

526 -* nd/indent-fix-connect-c (2014-03-13) 1 commit

527 - (merged to 'next' on 2014-03-17 at a109efc)

528 - + connect.c: SP after "}", not TAB

517 +* ap/remote-hg-skip-null-bookmarks (2014-03-25) 1 commit

518 + (merged to 'next' on 2014-03-25 at a8cd922)

519 + + remote-hg: do not fail on invalid bookmarks

520

521 Will merge to 'master'.

522

@@ -538,16 +529,6 @@ of the repositories listed at

529 Will merge to 'master'.

530

531

541 -* jk/warn-on-object-refname-ambiguity (2014-03-13) 4 commits

542 - (merged to 'next' on 2014-03-17 at 3f8e98e)

543 - + rev-list: disable object/refname ambiguity check with --stdin

544 - + cat-file: restore warn_on_object_refname_ambiguity flag

545 - + cat-file: fix a minor memory leak in batch_objects

546 - + cat-file: refactor error handling of batch_objects

547 -

548 - Will merge to 'master'.

549 -

550 -

532 * bp/commit-p-editor (2014-03-18) 7 commits

533 (merged to 'next' on 2014-03-21 at 23b6b06)

534 + run-command: mark run_hook_with_custom_index as deprecated

@@ -567,30 +548,6 @@ of the repositories listed at

548 Will merge to 'master'.

549

550

570 -* cp/am-patch-format-doc (2014-03-17) 2 commits

571 - (merged to 'next' on 2014-03-17 at 7437c77)

572 - + Documentation/git-am: typofix

573 - (merged to 'next' on 2014-03-12 at 17c3ada)

574 - + Documentation/git-am: Document supported --patch-format options

575 -

576 - Will merge to 'master'.

577 -

578 -

579 -* dm/configure-iconv-locale-charset (2014-03-11) 1 commit

580 - (merged to 'next' on 2014-03-20 at 4443bfd)

581 - + configure.ac: link with -liconv for locale_charset()

582 -

583 - Will merge to 'master'.

584 -

585 -

586 -* jk/mv-submodules-fix (2014-03-17) 2 commits

587 - (merged to 'next' on 2014-03-17 at 7cae3b1)

588 - + mv: prevent mismatched data when ignoring errors.

589 - + builtin/mv: fix out of bounds write

590 -

591 - Will merge to 'master'.

592 -

593 -

551 * cn/fetch-prune-overlapping-destination (2014-03-24) 3 commits

552 - SQUASH??? style and leak fix

553 - fetch: handle overlaping refspecs on --prune

@@ -605,18 +562,7 @@ of the repositories listed at

562 Hoping to be able to merge a fix for this issue soonish.

563

564

608 -* nd/commit-editor-cleanup (2014-02-25) 3 commits

609 - (merged to 'next' on 2014-03-17 at 986605d)

610 - + commit: add --cleanup=scissors

611 - + wt-status.c: move cut-line print code out to wt_status_add_cut_line

612 - + wt-status.c: make cut_line[] const to shrink .data section a bit

613 -

614 - "git commit --cleanup=<mode>" learned a new mode, scissors.

615 -

616 - Will merge to 'master'.

617 -

618 -

619 -* nd/multiple-work-trees (2014-03-17) 28 commits

565 +* nd/multiple-work-trees (2014-03-25) 28 commits

566 - count-objects: report unused files in $GIT_DIR/repos/...

567 - gc: support prune --repos

568 - gc: style change -- no SP before closing bracket

@@ -650,9 +596,6 @@ of the repositories listed at

596 rely on symbolic links and make sharing of objects and refs safer

597 by making the borrowee and borrowers aware of each other.

598

653 - Reported to break on a worktree whose leading path component has a

654 - symbolic link in it ($gmane/244822).

655 -

599

600 * ks/tree-diff-nway (2014-03-20) 19 commits

601 - combine-diff: speed it up, by using multiparent diff tree-walker directly

@@ -663,11 +606,12 @@ of the repositories listed at

606 - tree-diff: rework diff_tree interface to be sha1 based

607 - tree-diff: diff_tree() should now be static

608 - tree-diff: remove special-case diff-emitting code for empty-tree cases

666 - - tree-diff: simplify tree_entry_pathcmp

667 - - tree-diff: show_path prototype is not needed anymore

668 - - tree-diff: rename compare_tree_entry -> tree_entry_pathcmp

669 - - tree-diff: move all action-taking code out of compare_tree_entry()

670 - - tree-diff: don't assume compare_tree_entry() returns -1,0,1

609 + (merged to 'next' on 2014-03-25 at cfcbdac)

610 + + tree-diff: simplify tree_entry_pathcmp

611 + + tree-diff: show_path prototype is not needed anymore

612 + + tree-diff: rename compare_tree_entry -> tree_entry_pathcmp

613 + + tree-diff: move all action-taking code out of compare_tree_entry()

614 + + tree-diff: don't assume compare_tree_entry() returns -1,0,1

615 (merged to 'next' on 2014-03-21 at d872679)

616 + tree-diff: consolidate code for emitting diffs and recursion in one place

617 + tree-diff: show_tree() is not needed

@@ -695,23 +639,6 @@ of the repositories listed at

639 round. Will hold.

640

641

698 -* tr/remerge-diff (2014-02-26) 5 commits

699 - . log --remerge-diff: show what the conflict resolution changed

700 - . name-hash: allow dir hashing even when !ignore_case

701 - . merge-recursive: allow storing conflict hunks in index

702 - . revision: fold all merge diff variants into an enum merge_diff_mode

703 - . combine-diff: do not pass revs->dense_combined_merges redundantly

704 - (this branch uses tr/merge-recursive-index-only.)

705 -

706 - "log -p" output learns a new way to let users inspect a merge

707 - commit by showing the differences between the automerged result

708 - with conflicts the person who recorded the merge would have seen

709 - and the final conflict resolution that was recorded in the merge.

710 -

711 - RFC. This latest round clashes with the kb/fast-hashmap topic in

712 - 'master'.

713 -

714 -

642 * cc/interpret-trailers (2014-03-07) 11 commits

643 - Documentation: add documentation for 'git interpret-trailers'

644 - trailer: add tests for commands in config file

@@ -728,14 +655,7 @@ of the repositories listed at

655 A new filter to programatically edit the tail end of the commit log

656 messages.

657

731 -

732 -* tr/merge-recursive-index-only (2014-02-05) 3 commits

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

734 - - merge-recursive: internal flag to avoid touching the worktree

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

736 - (this branch is used by tr/remerge-diff.)

737 -

738 - Will hold.

658 + Will merge to 'next'.

659

660 --------------------------------------------------

661 [Discarded]

What's cooiking (2014/05 #06)