811f48eb14 · 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 (Dec 2012, #06; Fri, 21)

4 -X-master-at: b10c4add03044b7be358ff7231b9ec50016ded4b

5 -X-next-at: 808bd156aa134430a4d540ebae18639447253ec0

3 +Subject: What's cooking in git.git (Dec 2012, #07; Wed, 26)

4 +X-master-at: 86c3e6ed515d5e3bfca1d515c607db55ba032d71

5 +X-next-at: 3b93f37cbe43cae3e38334ca5dd4acf52ee3bfde

6

7 -What's cooking in git.git (Dec 2012, #06; Fri, 21)

7 +What's cooking in git.git (Dec 2012, #07; Wed, 26)

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

9

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

@@ -16,239 +16,79 @@ repositories listed at

16

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

18

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

20 -[Graduated to "master"]

21 -

22 -* as/doc-for-devs (2012-12-16) 2 commits

23 - (merged to 'next' on 2012-12-18 at ff1f37e)

24 - + Documentation: move support for old compilers to CodingGuidelines

25 - + SubmittingPatches: add convention of prefixing commit messages

26 -

27 - It might be a better idea to move the text the bottom one adds to

28 - the extended description from the quick checklist part.

29 -

30 - Will fast-track to the upcoming release.

31 -

32 -

33 -* cr/doc-checkout-branch (2012-12-18) 2 commits

34 - (merged to 'next' on 2012-12-19 at e14b6c4)

35 - + Documentation/git-checkout.txt: document 70c9ac2 behavior

36 - + Documentation/git-checkout.txt: clarify usage

37 -

38 - Document the magic "git checkout <no-such-branch>" hack to create

39 - local branch out of a remote tracking branch that hasn't been

40 - documented so far.

41 -

42 - Will fast-track to the upcoming release.

43 -

44 -

45 -* jc/doc-diff-blobs (2012-12-18) 1 commit

46 - (merged to 'next' on 2012-12-19 at 82c5000)

47 - + Documentation: Describe "git diff <blob> <blob>" separately

48 -

49 - "git diff <blob> <blob>" was not documented and was only hinted as

50 - an extension to "git diff <commit> <commit> -- <pathspec>", but

51 - comparison between two blobs are more special than that. It does

52 - not take any pathspec to begin with.

53 -

54 - Will fast-track to the upcoming release.

55 -

56 -

57 -* jc/fetch-tags-doc (2012-12-13) 1 commit

58 - (merged to 'next' on 2012-12-17 at 857413a)

59 - + fetch --tags: clarify documentation

60 -

61 - "git fetch --tags" was explained as if it were "git fetch

62 - --no-no-tags", which is not the case, causing confusion.

63 -

64 - Will fast-track to the upcoming release.

65 -

66 -

67 -* jk/avoid-mailto-invalid-in-doc (2012-12-16) 1 commit

68 - (merged to 'next' on 2012-12-18 at 81dac40)

69 - + Documentation: don't link to example mail addresses

70 -

71 - Avoids invalid sample e-mail addresses from becoming mailto links

72 - in the formatted output.

73 -

74 - Will fast-track to the upcoming release.

75 -

76 -

77 -* jk/mailmap-cleanup (2012-12-12) 5 commits

78 - (merged to 'next' on 2012-12-17 at 07c1a11)

79 - + contrib: update stats/mailmap script

80 - + .mailmap: normalize emails for Linus Torvalds

81 - + .mailmap: normalize emails for Jeff King

82 - + .mailmap: fix broken entry for Martin Langhoff

83 - + .mailmap: match up some obvious names/emails

84 -

85 - Update various entries in our .mailmap file.

86 -

87 - Will fast-track to the upcoming release.

88 -

89 -

90 -* nd/index-format-doc (2012-12-13) 1 commit

91 - (merged to 'next' on 2012-12-17 at 7984924)

92 - + index-format.txt: clarify what is "invalid"

93 -

94 - Will fast-track to the upcoming release.

95 -

96 -

97 -* sl/git-svn-docs (2012-12-05) 4 commits

98 - (merged to 'next' on 2012-12-07 at 5bfbb73)

99 - + git-svn: Note about tags.

100 - + git-svn: Expand documentation for --follow-parent

101 - + git-svn: Recommend use of structure options.

102 - + git-svn: Document branches with at-sign(@).

103 -

104 - Will fast-track to the upcoming release.

105 -

106 -

107 -* sl/readme-gplv2 (2012-12-15) 2 commits

108 - (merged to 'next' on 2012-12-18 at c839810)

109 - + README: it does not matter who the current maintainer is

110 - + README: Git is released under the GPLv2, not just "the GPL"

111 -

112 - Clarify that the project as a whole is GPLv2 only, with some parts

113 - borrowed under different licenses that are compatible with GPLv2.

114 -

115 - Will fast-track to the upcoming release.

116 -

117 -

118 -* ta/api-index-doc (2012-12-16) 1 commit

119 - (merged to 'next' on 2012-12-18 at a251888)

120 - + Remove misleading date from api-index-skel.txt

121 -

122 - Will fast-track to the upcoming release.

123 -

124 -

125 -* ta/new-command-howto (2012-12-21) 1 commit

126 - (merged to 'next' on 2012-12-21 at 5d0f65f)

127 - + Move ./technical/api-command.txt to ./howto/new-command.txt

128 -

129 - Will fast-track to the upcoming release.

130 -

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

20 [New Topics]

21

134 -* jc/mkstemp-more-careful-error-reporting (2012-12-18) 1 commit

135 - - xmkstemp(): avoid showing truncated template more carefully

22 +* jc/format-patch-reroll (2012-12-22) 7 commits

23 + - format-patch: add --reroll-count=$N option

24 + - get_patch_filename(): split into two functions

25 + - get_patch_filename(): drop "just-numbers" hack

26 + - get_patch_filename(): simplify function signature

27 + - builtin/log.c: stop using global patch_suffix

28 + - builtin/log.c: drop redundant "numbered_files" parameter from make_cover_letter()

29 + - builtin/log.c: drop unused "numbered" parameter from make_cover_letter()

30

137 - An earlier patch to save original arguments to mkstemp() away and

138 - use it to report what filename we failed to create incorrectly used

139 - the buffer munged by failing mkstemp().

31 + Teach "format-patch" to prefix v4- to its output files for the

32 + fourth iteration of a patch series, to make it easier for the

33 + submitter to keep separate copies for iterations.

34

141 - Will merge to 'next'.

142 -

143 -

144 -* jc/maint-test-portability (2012-12-19) 3 commits

145 - - t4014: fix arguments to grep

146 - - t9502: do not assume GNU tar

147 - - t0200: "locale" may not exist

148 - (this branch is used by jc/test-portability.)

149 -

150 - Minor test fixes noticed while running our tests on OpenBSD 5.2,

151 - applicable to 'maint'.

152 -

153 - Will merge to 'next'.

35 + Needs tests and documentation updates.

36

37

156 -* jc/test-portability (2012-12-19) 3 commits

157 - - t9020: use configured Python to run the test helper

158 - - t3600: Avoid "cp -a", which is a GNUism

159 - - Merge branch 'jc/maint-test-portability' into 'jc/test-portability'

160 - (this branch uses jc/maint-test-portability.)

161 -

162 - The remainder of jc/maint-test-portability, applicable to 'master'.

38 +* ms/subtree-fixlets (2012-12-22) 2 commits

39 + (merged to 'next' on 2012-12-26 at 1cb26eb)

40 + + git-subtree: fix typo in manpage

41 + + git-subtree: ignore git-subtree executable

42

164 - Will merge to 'next'.

165 -

166 -

167 -* jc/maint-fnmatch-old-style-definition (2012-12-19) 1 commit

168 - - compat/fnmatch: update old-style definition to ANSI

169 -

170 - Update old-style function definition "int foo(bar) int bar; {}"

171 - to "int foo(int bar) {}".

172 -

173 - Will merge to 'next'.

43 + Will cook in 'next'.

44

45

176 -* jk/pathspec-literal (2012-12-19) 1 commit

177 - - add global --literal-pathspecs option

178 -

179 - Allow scripts to feed literal paths to commands that take

180 - pathspecs, by disabling wildcard globbing.

46 +* mz/pick-unborn (2012-12-23) 2 commits

47 + - learn to pick/revert into unborn branch

48 + - tests: move test_cmp_rev to test-lib-functions

49

50 Will merge to 'next'.

51

52

185 -* da/p4merge-mktemp (2012-12-21) 1 commit

186 - - mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

187 -

188 - Create an empty file in $TMPDIR instead of using an empty file in

189 - the local directory (but why?).

190 -

191 -

192 -* er/python-version-requirements (2012-12-20) 2 commits

193 - - (squash???) remote-helpers/git/__init__.py needs sys before checking sys.hexversion

194 - - Python scripts: check minimum compatible version after auditing

195 -

196 - Will merge to 'next' after getting an Ack on the top-squash.

197 -

198 -

199 -* jc/unpack-file-in-tmpdir (2012-12-19) 1 commit

200 - - unpack-file: allow output to be in $TMPDIR

201 -

202 - Throw-away "how about this" to teach unpack-file to use $TMPDIR to

203 - store its output.

204 -

205 - Will discard.

206 -

53 +* nd/retire-fnmatch (2012-12-22) 8 commits

54 + - wildmatch: advance faster in <asterisk> + <literal> patterns

55 + - wildmatch: make a special case for "*/" with FNM_PATHNAME

56 + - Makefile: add USE_WILDMATCH to use wildmatch as fnmatch

57 + - test-wildmatch: add "perf" command to compare wildmatch and fnmatch

58 + - wildmatch: support "no FNM_PATHNAME" mode

59 + - wildmatch: make dowild() take arbitrary flags

60 + - wildmatch: rename constants and update prototype

61 + - compat/fnmatch: respect NO_FNMATCH* even on glibc

62 + (this branch uses nd/wildmatch.)

63

208 -* mb/gitweb-highlight-link-target (2012-12-20) 1 commit

209 - - Highlight the link target line in Gitweb using CSS

210 -

211 - Expecting a reroll.

64 + Replace our use of fnmatch(3) with a more feature-rich wildmatch.

65

66

214 -* mz/oneway-merge-wo-u-no-lstat (2012-12-20) 1 commit

215 - - oneway_merge(): only lstat() when told to update worktree

216 -

217 - Optimize "read-tree -m <tree-ish>" without "-u".

218 -

219 - Will merge to 'next'.

67 +* jc/test-cvs-no-init-in-existing-dir (2012-12-24) 1 commit

68 + (merged to 'next' on 2012-12-26 at 3b93f37)

69 + + t9200: let "cvs init" create the test repository

70

71 + Will cook in 'next'.

72

222 -* jk/repack-ref-racefix (2012-12-21) 1 commit

223 - - refs: do not use cached refs in repack_without_ref

73

225 - Race-fix for pack-refs running in parallel to ref creation.

74 +* os/gitweb-highlight-uncaptured (2012-12-26) 1 commit

75 + - gitweb: fix error when highlight is enabled

76

77 Will merge to 'next'.

78

79

230 -* rb/http-cert-cred-no-username-prompt (2012-12-21) 1 commit

231 - - http.c: Avoid username prompt for certifcate credentials

80 +* so/prompt-command (2012-12-26) 1 commit

81 + (merged to 'next' on 2012-12-26 at 27c5683)

82 + + make __git_ps1 accept a third parameter in pcmode

83

233 - There is no need to ask for username if the authentication is done

234 - by certificate identity.

84 + Gives the same degree of customizability to the new prompt command

85 + mode users as the command substitution mode has.

86

236 - Will merge to 'next'.

87 + Will fast-track to 'master' before 1.8.1 final.

88

89 --------------------------------------------------

90 [Stalled]

91

241 -* jc/merge-blobs (2012-12-13) 5 commits

242 - . [broken] wip to fix d/f conflicts

243 - - merge-tree: add comments to clarify what these functions are doing

244 - - merge-tree: lose unused "resolve_directories"

245 - - merge-tree: lose unused "flags" from merge_list

246 - - Which merge_file() function do you mean?

247 -

248 - A beginning of a new merge strategy based on the disused merge-tree

249 - proof-of-concept code.

250 -

251 -

92 * jc/doc-maintainer (2012-11-27) 1 commit

93 - update "howto maintain git"

94

@@ -400,16 +240,6 @@ repositories listed at

240 Need to address the installation half if this is to be any useful.

241

242

403 -* mk/maint-graph-infinity-loop (2012-09-25) 1 commit

404 - - graph.c: infinite loop in git whatchanged --graph -m

405 -

406 - The --graph code fell into infinite loop when asked to do what the

407 - code did not expect ;-)

408 -

409 - Anybody who worked on "--graph" wants to comment?

410 - Stalled mostly due to lack of responses.

411 -

412 -

243 * jc/add-delete-default (2012-08-13) 1 commit

244 - git add: notice removal of tracked paths by default

245

@@ -443,28 +273,133 @@ repositories listed at

273 --------------------------------------------------

274 [Cooking]

275

276 +* jc/merge-blobs (2012-12-26) 5 commits

277 + - merge-tree: fix d/f conflicts

278 + - merge-tree: add comments to clarify what these functions are doing

279 + - merge-tree: lose unused "resolve_directories"

280 + - merge-tree: lose unused "flags" from merge_list

281 + - Which merge_file() function do you mean?

282 +

283 + A beginning of a new merge strategy based on the disused merge-tree

284 + proof-of-concept code.

285 +

286 +

287 +* mk/maint-graph-infinity-loop (2012-09-25) 1 commit

288 + (merged to 'next' on 2012-12-26 at 2ff59ab)

289 + + graph.c: infinite loop in git whatchanged --graph -m

290 +

291 + The --graph code fell into infinite loop when asked to do what the

292 + code did not expect ;-)

293 +

294 +

295 +* jc/mkstemp-more-careful-error-reporting (2012-12-18) 1 commit

296 + (merged to 'next' on 2012-12-22 at 18cdaf0)

297 + + xmkstemp(): avoid showing truncated template more carefully

298 +

299 + An earlier patch to save original arguments to mkstemp() away and

300 + use it to report what filename we failed to create incorrectly used

301 + the buffer munged by failing mkstemp().

302 +

303 +

304 +* jc/maint-test-portability (2012-12-19) 3 commits

305 + (merged to 'next' on 2012-12-22 at daeed53)

306 + + t4014: fix arguments to grep

307 + + t9502: do not assume GNU tar

308 + + t0200: "locale" may not exist

309 + (this branch is used by jc/test-portability.)

310 +

311 + Minor test fixes noticed while running our tests on OpenBSD 5.2,

312 + applicable to 'maint'.

313 +

314 +

315 +* jc/test-portability (2012-12-19) 3 commits

316 + (merged to 'next' on 2012-12-22 at 123041b)

317 + + t9020: use configured Python to run the test helper

318 + + t3600: Avoid "cp -a", which is a GNUism

319 + + Merge branch 'jc/maint-test-portability' into 'jc/test-portability'

320 + (this branch uses jc/maint-test-portability.)

321 +

322 + The remainder of jc/maint-test-portability, applicable to 'master'.

323 +

324 +

325 +* jc/maint-fnmatch-old-style-definition (2012-12-19) 1 commit

326 + (merged to 'next' on 2012-12-22 at 540df2c)

327 + + compat/fnmatch: update old-style definition to ANSI

328 +

329 + Update old-style function definition "int foo(bar) int bar; {}"

330 + to "int foo(int bar) {}".

331 +

332 +

333 +* jk/pathspec-literal (2012-12-19) 1 commit

334 + (merged to 'next' on 2012-12-22 at c794bd6)

335 + + add global --literal-pathspecs option

336 +

337 + Allow scripts to feed literal paths to commands that take

338 + pathspecs, by disabling wildcard globbing.

339 +

340 +

341 +* da/p4merge-mktemp (2012-12-21) 1 commit

342 + (merged to 'next' on 2012-12-26 at bb680a9)

343 + + mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

344 +

345 + Create an empty file in $TMPDIR instead of using an empty file in

346 + the local directory.

347 +

348 +

349 +* er/python-version-requirements (2012-12-25) 1 commit

350 + - Python scripts: check minimum compatible version after auditing

351 +

352 + Expecting a reroll.

353 +

354 +

355 +* mb/gitweb-highlight-link-target (2012-12-20) 1 commit

356 + - Highlight the link target line in Gitweb using CSS

357 +

358 + Expecting a reroll.

359 +

360 +

361 +* mz/oneway-merge-wo-u-no-lstat (2012-12-20) 1 commit

362 + (merged to 'next' on 2012-12-22 at 87bd30e)

363 + + oneway_merge(): only lstat() when told to update worktree

364 +

365 + Optimize "read-tree -m <tree-ish>" without "-u".

366 +

367 +

368 +* jk/repack-ref-racefix (2012-12-21) 1 commit

369 + (merged to 'next' on 2012-12-22 at 03e1ca9)

370 + + refs: do not use cached refs in repack_without_ref

371 +

372 + Race-fix for pack-refs running in parallel to ref creation.

373 +

374 +

375 +* rb/http-cert-cred-no-username-prompt (2012-12-21) 1 commit

376 + (merged to 'next' on 2012-12-22 at 9fc28ed)

377 + + http.c: Avoid username prompt for certifcate credentials

378 +

379 + It is wrong to ask for username if the authentication is done by

380 + certificate identity.

381 +

382 +

383 * wk/submodule-update-remote (2012-12-19) 3 commits

447 - - submodule add: If --branch is given, record it in .gitmodules

448 - - submodule update: add --remote for submodule's upstream changes

449 - - submodule: add get_submodule_config helper funtion

384 + (merged to 'next' on 2012-12-22 at 7ddf897)

385 + + submodule add: If --branch is given, record it in .gitmodules

386 + + submodule update: add --remote for submodule's upstream changes

387 + + submodule: add get_submodule_config helper funtion

388

389 The beginning of 'integrate with the tip of the remote branch, not

390 the commit recorded in the superproject gitlink' support.

391

454 - Will merge to 'next'.

455 -

392

393 * cc/no-gitk-build-dependency (2012-12-18) 3 commits

458 - - Makefile: replace "echo 1>..." with "echo >..."

459 - - Makefile: detect when PYTHON_PATH changes

460 - - Makefile: remove tracking of TCLTK_PATH

394 + (merged to 'next' on 2012-12-22 at da7b2cf)

395 + + Makefile: replace "echo 1>..." with "echo >..."

396 + + Makefile: detect when PYTHON_PATH changes

397 + + Makefile: remove tracking of TCLTK_PATH

398

399 Remove leftover bits from an earlier change to move gitk in its own

400 subdirectory. Reimplementing the dependency tracking rules needs

401 to be done in gitk history separately.

402

466 - Will merge to 'next'.

467 -

403

404 * jc/format-color-auto (2012-12-17) 2 commits

405 (merged to 'next' on 2012-12-18 at 5aaac94)

@@ -478,11 +413,13 @@ repositories listed at

413

414

415 * ss/svn-prompt (2012-12-17) 3 commits

481 - - git-svn, perl/Git.pm: extend and use Git->prompt method for querying users

482 - - perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set

483 - - git-svn, perl/Git.pm: add central method for prompting passwords

416 + (merged to 'next' on 2012-12-26 at 1012ae2)

417 + + git-svn, perl/Git.pm: extend and use Git->prompt method for querying users

418 + + perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set

419 + + git-svn, perl/Git.pm: add central method for prompting passwords

420

485 - Waiting for an Ack from the area export.

421 + Tweak the way "git svn" asks for password to be in line with the

422 + rest of the system, so that the same SSH/GIT_ASKPASS can be used.

423

424

425 * zk/clean-report-failure (2012-12-17) 1 commit

@@ -493,6 +430,8 @@ repositories listed at

430 removed after recursing into a directory, which makes the output

431 confusing and even wrong.

432

433 + Expecting a reroll.

434 +

435

436 * mp/complete-paths (2012-12-21) 1 commit

437 - git-completion.bash: add support for path completion

@@ -502,7 +441,7 @@ repositories listed at

441 would not want to add an unmodified path). Teach it to use a more

442 git-aware logic to enumerate only relevant ones.

443

505 - Waiting for area-experts review.

444 + Waiting for area-experts' review.

445

446

447 * ja/directory-attrs (2012-12-17) 1 commit

@@ -532,13 +471,14 @@ repositories listed at

471

472

473 * dm/port (2012-12-19) 4 commits

535 - - git-compat-util.h: do not #include <sys/param.h> by default

536 - - Generalize the inclusion of strings.h

537 - - Detect when the passwd struct is missing pw_gecos

538 - - Support builds when sys/param.h is missing

474 + (merged to 'next' on 2012-12-22 at 8adc198)

475 + + git-compat-util.h: do not #include <sys/param.h> by default

476 + + Generalize the inclusion of strings.h

477 + + Detect when the passwd struct is missing pw_gecos

478 + + Support builds when sys/param.h is missing

479 (this branch is used by mk/qnx.)

480

541 - Will merge to 'next'.

481 + Add a few more knobs for new platform ports can tweak.

482

483

484 * jk/complete-commit-c (2012-12-15) 1 commit

@@ -552,51 +492,38 @@ repositories listed at

492

493

494 * jk/error-const-return (2012-12-15) 2 commits

555 - - silence some -Wuninitialized false positives

556 - - make error()'s constant return value more visible

495 + (merged to 'next' on 2012-12-22 at bf2b1cd)

496 + + silence some -Wuninitialized false positives

497 + + make error()'s constant return value more visible

498

499 Help compilers' flow analysis by making it more explicit that

500 error() always returns -1, to reduce false "variable used

501 uninitialized" warnings. Looks somewhat ugly but not too much.

502

562 - Will merge to 'next'.

563 -

503

504 * mk/qnx (2012-12-19) 2 commits

566 - - Port to QNX

567 - - Make lock local to fetch_pack

505 + (merged to 'next' on 2012-12-22 at 0473197)

506 + + Port to QNX

507 + + Make lock local to fetch_pack

508 (this branch uses dm/port.)

509

510 Port to QNX; we may want to rebase this on top of dm/port topic as

511 it also wants to use the HAVE_STRINGS_H mechanism it introduces.

512

573 - Will merge to 'next'.

574 -

575 -

576 -* rj/maint-cygwin-say-color (2012-12-15) 1 commit

577 - - tests: Allow customization of how say_color() prints

578 -

579 - Even though I do not think of a cleaner way to do this, I am not

580 - happy with the way how $GIT_TEST_PRINT and $GIT_TEST_PRINT_LN are

581 - interpolated into the command line with token splitting at $IFS.

582 -

583 - Will discard, per discussion with the author.

584 -

513

514 * as/test-tweaks (2012-12-20) 7 commits

587 - - tests: paint unexpectedly fixed known breakages in bold red

588 - - tests: test the test framework more thoroughly

589 - - tests: refactor mechanics of testing in a sub test-lib

590 - - tests: change info messages from yellow/brown to cyan

591 - - tests: paint skipped tests in blue

592 - - tests: paint known breakages in yellow

593 - - tests: test number comes first in 'not ok $count - $message'

515 + (merged to 'next' on 2012-12-22 at 7312c6c)

516 + + tests: paint unexpectedly fixed known breakages in bold red

517 + + tests: test the test framework more thoroughly

518 + + tests: refactor mechanics of testing in a sub test-lib

519 + + tests: change info messages from yellow/brown to cyan

520 + + tests: paint skipped tests in blue

521 + + tests: paint known breakages in yellow

522 + + tests: test number comes first in 'not ok $count - $message'

523

524 Various minor tweaks to the test framework to paint its output

525 lines in colors that match what they mean better.

526

598 - Will merge to 'next'.

599 -

527

528 * sp/shortlog-missing-lf (2012-12-11) 2 commits

529 (merged to 'next' on 2012-12-11 at 64b8429)

@@ -610,7 +537,9 @@ repositories listed at

537 Will cook in 'next'.

538

539

613 -* ap/log-mailmap (2012-12-15) 7 commits

540 +* ap/log-mailmap (2012-12-26) 9 commits

541 + - log: add log.mailmap configuration option

542 + - log: grep author/committer using mailmap

543 - test: Add test for --use-mailmap option

544 - log: Add --use-mailmap option

545 - pretty: Use mailmap to display username and email

@@ -622,7 +551,8 @@ repositories listed at

551 Clean up various codepaths around mailmap and teach the "log"

552 machinery to use it.

553

625 - Will merge to 'next' after reading it over once again.

554 + I think this is almost ready for 'next' with minor fix-ups to avoid

555 + unnecessary copying.

556

557

558 * jc/fetch-ignore-symref (2012-12-11) 1 commit

@@ -854,6 +784,7 @@ repositories listed at

784 + Import wildmatch from rsync

785 + ctype: support iscntrl, ispunct, isxdigit and isprint

786 + ctype: make sane_ctype[] const array

787 + (this branch is used by nd/retire-fnmatch.)

788

789 Allows pathname patterns in .gitignore and .gitattributes files

790 with double-asterisks "foo/**/bar" to match any number of directory

@@ -883,3 +814,24 @@ repositories listed at

814 Require "-f" for push to update a tag, even if it is a fast-forward.

815

816 Will cook in 'next'.

817 +

818 +--------------------------------------------------

819 +[Discarded]

820 +

821 +* jc/unpack-file-in-tmpdir (2012-12-19) 1 commit

822 + . unpack-file: allow output to be in $TMPDIR

823 +

824 + Throw-away "how about this" to teach unpack-file to use $TMPDIR to

825 + store its output.

826 +

827 + Discarded, as da/p4merge-mktemp was rewritten not to require mktemp.

828 +

829 +

830 +* rj/maint-cygwin-say-color (2012-12-15) 1 commit

831 + . tests: Allow customization of how say_color() prints

832 +

833 + Even though I do not think of a cleaner way to do this, I am not

834 + happy with the way how $GIT_TEST_PRINT and $GIT_TEST_PRINT_LN are

835 + interpolated into the command line with token splitting at $IFS.

836 +

837 + Discarded, per discussion with the author.

What's cooking (2012/12 #07)