6d3f3c793c · matheusbsbs/matheus-bagliano

@@ -1,19 +1,16 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Apr 2012, #04; Tue, 10)

3 -X-master-at: 7945c7fad05da2ac7f6f1f89202799993a591eac

4 -X-next-at: ed64435ffdef61ad35e045a9d6fc46a098169618

2 +Subject: What's cooking in git.git (Apr 2012, #05; Thu, 12)

3 +X-master-at: 36e6c803a1ef68b8acdc4138597db4fb087112be

4 +X-next-at: 3bf1d831cc29e917a2cd49a8a2df911e3b3ff26c

5

6 -What's cooking in git.git (Apr 2012, #04; Tue, 10)

6 +What's cooking in git.git (Apr 2012, #05; Thu, 12)

7 --------------------------------------------------

8

9 Here are the topics that have been cooking. Commits prefixed with '-' are

10 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

11

12 This issue describes the state of my tree in preparation for opening the

13 -post 1.7.10 cycle. The 'next' branch has not been rewound yet, but it

14 -soon will be. The Stalled topics will be discarded by default.

15 -

16 -"git subtree" is in contrib/ now.

13 +post 1.7.10 cycle. The 'next' branch has been rewound.

14

15 You can find the changes described here in the integration branches of the

16 repositories listed at

@@ -23,59 +20,97 @@ repositories listed at

20 --------------------------------------------------

21 [New Topics]

22

26 -* bw/submodule-sed-solaris (2012-04-09) 1 commit

27 - - Avoid bug in Solaris xpg4/sed as used in submodule

23 +* mh/ref-api (2012-04-10) 13 commits

24 + - do_for_each_ref(): only iterate over the subtree that was requested

25 + - refs: store references hierarchically

26 + - sort_ref_dir(): simplify logic

27 + - refs.c: rename ref_array -> ref_dir

28 + - struct ref_entry: nest the value part in a union

29 + - check_refname_component(): return 0 for zero-length components

30 + - free_ref_entry(): new function

31 + - names_conflict(): simplify implementation

32 + - repack_without_ref(): reimplement using do_for_each_ref_in_array()

33 + - do_for_each_ref_in_arrays(): new function

34 + - do_for_each_ref_in_array(): new function

35 + - refs: manage current_ref within do_one_ref()

36 + - refs.c: reorder definitions more logically

37 +

38 +Allows walking only a sub-hierarchy in refs/*.

39

29 -Sensible.

40 Will merge to 'next'.

41

32 -* cb/http-multi-curl-auth (2012-04-10) 2 commits

33 - - fix http auth with multiple curl handles

34 - - http auth fails with multiple curl handles

42 +* jc/maint-blame-minimal (2012-04-11) 1 commit

43 + - blame: accept --need-minimal

44

36 -Fixes http authentication breakage when we keep multiple HTTP requests in

37 -flight using curl-multi.

38 -

39 -Peff may want to sign this off, but otherwise looked sensible.

45 +"git blame" started missing quite a few changes from the origin since we

46 +stopped using the diff minimalization by default in v1.7.2 era.

47

41 -* jk/rebase-i-submodule-conflict-only (2012-04-09) 1 commit

42 - - rebase -i continue: don't skip commits that only change submodules

48 +Will merge to 'next'.

49

44 -Giving "--continue" to a conflicted "rebase -i" session skipped a commit

45 -that only results in changes to submodules.

50 +* jk/repack-no-explode-objects-from-old-pack (2012-04-11) 1 commit

51 + - gc: do not explode objects which will be immediately pruned

52

47 -Sensible.

53 Will merge to 'next'.

54

50 -* ms/remote-usage-string (2012-04-09) 1 commit

51 - - remote: update builtin usage

55 +* ld/git-p4-tags-and-labels (2012-04-11) 2 commits

56 + - git p4: import/export of labels to/from p4

57 + - git p4: Fixing script editor checks

58 + (this branch uses pw/git-p4.)

59

53 -As an independent follow-up, we may want to rethink how the overall usage

54 -string and subcommand usage strings are maintained.

60 +* lt/octopus-simplify (2012-04-12) 1 commit

61 + - Make 'git merge' simplify parents earlier

62

56 -Will merge to 'next'.

63 +Octopus merge strategy did not reduce heads that are recorded in the final

64 +commit. This was done off-list.

65

58 -* pw/fast-import-dataref-parsing (2012-04-10) 1 commit

59 - - fast-import: tighten parsing of datarefs

66 +* mr/fetch-call-a-non-branch-a-ref (2012-04-11) 1 commit

67 + - fetch: Only call a new ref a "branch" if it's under refs/heads/.

68

61 -* pw/git-p4 (2012-04-09) 3 commits

62 - - git p4: use "git p4" directly in tests

63 - - git p4: update name in script

64 - - git-p4: move to toplevel

69 +The change itself may be sensible, but it exposes a funny in the vicinity

70 +about recursive submodule fetching behaviour.

71

66 -Will merge to 'next'.

72 +* nh/empty-rebase (2012-04-11) 3 commits

73 + - git-cherry-pick: add test to validate new options

74 + - git-cherry-pick: add --keep-redundant-commits option

75 + - git-cherry-pick: add allow-empty option

76

68 -* rl/show-empty-prefix (2012-04-10) 1 commit

69 - - rev-parse --show-prefix: add in trailing newline

77 +Waiting for a reroll.

78 +

79 +* sl/test-wc-l-line-count (2012-04-11) 1 commit

80 + - tests: modernise style: more uses of test_line_count

81

82 Will merge to 'next'.

83

73 -* tr/xdiff-fast-hash (2012-04-09) 1 commit

74 - - xdiff: load full words in the inner loop of xdl_hash_record

84 +* zj/upstream-error-message (2012-04-11) 5 commits

85 + - i18n: mark @{upstream} error messages for translation

86 + - Be more specific if upstream branch is not fetched

87 + - Provide better message for barnhc_wiht_tpyo@{u}

88 + - Provide branch name in error message when using @{u}

89 + - t1507: add additional tests for @{upstream}

90 +

91 +Waiting for a reroll.

92 +

93 +* fc/completion-tests (2012-04-12) 1 commit

94 + - tests: add initial bash completion tests

95 +

96 +Will merge to 'next'.

97

98 --------------------------------------------------

99 [Stalled]

100

101 +* nl/http-proxy-more (2012-04-12) 6 commits

102 + - fixup? 6e17b8c

103 + - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

104 + - http: Avoid limit of retrying request only twice

105 + - http: handle proxy authentication failure (error 407)

106 + - http: handle proxy proactive authentication

107 + - http: try http_proxy env var when http.proxy config option is not set

108 +

109 +The code to talk to http proxies learn to use the same credential

110 +API used to talk to the final http destinations.

111 +

112 +Kicked back to 'pu', as it breaks the proxied codepath quite badly.

113 +

114 * lp/maint-diff-three-dash-with-graph (2012-03-20) 3 commits

115 - t4202: add test for "log --graph --stat -p" separator lines

116 - log --graph: fix break in graph lines

@@ -84,7 +119,7 @@ Will merge to 'next'.

119 With a review from Zbigniew, I have been expecting that this would be

120 rerolled, but that didn't happen.

121

87 -Will discard shortly unless nothing happens.

122 +Waiting for a reroll.

123

124 * cn/apply-fix-ws-can-lengthen-lines (2012-03-11) 1 commit

125 . apply: reallocate the postimage buffer when needed

@@ -94,7 +129,7 @@ of an oddball "tab-in-indent" whitespace breakage class that wants

129 to have longer lines than the original when fixing things up; broken

130 and results in double-frees.

131

97 -Will discard shortly unless nothing happens.

132 +Will discard shortly if nothing happens.

133

134 * nd/columns (2012-03-13) 12 commits

135 - column: support grouping entries

@@ -113,28 +148,7 @@ Will discard shortly unless nothing happens.

148 Modulo minor nits, looked nicer than the previous round and getting closer

149 to completion but nothing has happened recently.

150

116 -Will discard shortly unless nothing happens.

117 -

118 -* nd/threaded-index-pack (2012-03-11) 2 commits

119 - - index-pack: support multithreaded delta resolving

120 - - index-pack: split second pass obj handling into own function

121 -

122 -Another reroll after a bugreport on pthread usage discovered by Ramsey,

123 -but it seems the topic is cooking between Ramsay and Duy out of tree.

124 -

125 -Will discard shortly unless nothing happens.

126 -

127 -* jh/apply-free-patch (2012-03-28) 7 commits

128 - - apply.c: WIP ownership audit

129 - - apply: free unused fragments for submodule patch

130 - - apply: free patch->result

131 - - apply: release memory for fn_table

132 - - apply: free patch->{def,old,new}_name fields

133 - - apply: rename free_patch() to free_patch_list()

134 - - apply: do not leak patches and fragments

135 -

136 -Valgrind reports quite a lot of discarded memory inside apply. I started

137 -auditing the memory ownership rules in the command, and am almost done.

151 +Will discard shortly if nothing happens.

152

153 * ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits

154 - fixup! 15eaaf4

@@ -146,7 +160,7 @@ from Ævar. The second one needs more work, both in perl/Git.pm and

160 prompt.c, to give precedence to tty over SSH_ASKPASS when terminal

161 is available.

162

149 -Will discard shortly unless nothing happens.

163 +Will discard shortly if nothing happens.

164

165 * jc/split-blob (2012-04-03) 7 commits

166 - chunked-object: streaming checkout

@@ -183,6 +197,79 @@ not working :-(.

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

198 [Cooking]

199

200 +* jh/apply-free-patch (2012-04-11) 9 commits

201 + - apply: document buffer ownership rules across functions

202 + - apply: tighten constness of line buffer

203 + - apply: drop unused macro

204 + - apply: free unused fragments for submodule patch

205 + - apply: free patch->result

206 + - apply: release memory for fn_table

207 + - apply: free patch->{def,old,new}_name fields

208 + - apply: rename free_patch() to free_patch_list()

209 + - apply: do not leak patches and fragments

210 +

211 +Valgrind reports quite a lot of discarded memory inside apply.

212 +

213 +Will merge to 'next'.

214 +

215 +* nd/threaded-index-pack (2012-04-11) 3 commits

216 + - index-pack: support multithreaded delta resolving

217 + - index-pack: split second pass obj handling into own function

218 + - compat/win32/pthread.h: Add an pthread_key_delete() implementation

219 +

220 +* bw/submodule-sed-solaris (2012-04-09) 1 commit

221 + (merged to 'next' on 2012-04-12 at 3bf1d83)

222 + + Avoid bug in Solaris xpg4/sed as used in submodule

223 +

224 +* cb/http-multi-curl-auth (2012-04-10) 2 commits

225 + - fix http auth with multiple curl handles

226 + - http auth fails with multiple curl handles

227 +

228 +Fixes http authentication breakage when we keep multiple HTTP requests in

229 +flight using curl-multi.

230 +

231 +I haven't looked at Peff's follow-up deeply yet. Perhaps a reroll is

232 +coming?

233 +

234 +* jk/rebase-i-submodule-conflict-only (2012-04-09) 1 commit

235 + - rebase -i continue: don't skip commits that only change submodules

236 +

237 +Giving "--continue" to a conflicted "rebase -i" session skipped a commit

238 +that only results in changes to submodules.

239 +

240 +Will merge to 'next'.

241 +

242 +* ms/remote-usage-string (2012-04-09) 1 commit

243 + - remote: update builtin usage

244 +

245 +As an independent follow-up, we may want to rethink how the overall usage

246 +string and subcommand usage strings are maintained.

247 +

248 +Will merge to 'next'.

249 +

250 +* pw/fast-import-dataref-parsing (2012-04-10) 1 commit

251 + - fast-import: tighten parsing of datarefs

252 +

253 +Will merge to 'next'.

254 +

255 +* pw/git-p4 (2012-04-09) 3 commits

256 + - git p4: use "git p4" directly in tests

257 + - git p4: update name in script

258 + - git-p4: move to toplevel

259 + (this branch is used by ld/git-p4-tags-and-labels.)

260 +

261 +Will merge to 'next'.

262 +

263 +* rl/show-empty-prefix (2012-04-10) 1 commit

264 + - rev-parse --show-prefix: add in trailing newline

265 +

266 +Will merge to 'next'.

267 +

268 +* tr/xdiff-fast-hash (2012-04-09) 1 commit

269 + - xdiff: load full words in the inner loop of xdl_hash_record

270 +

271 +Will merge to 'next'.

272 +

273 * jc/index-v4 (2012-04-04) 10 commits

274 - update-index: upgrade/downgrade on-disk index version

275 - read-cache.c: write prefix-compressed names in the index

@@ -202,54 +289,51 @@ eventually want to have, but the preparatory refactoring steps and the way

289 how backward compatibility is retained should give plenty to learn to GSoC

290 student-hopefuls.

291

292 +Will merge to 'next', if nobody objects.

293 +

294 * jk/add-p-skip-conflicts (2012-04-05) 1 commit

206 - - add--interactive: ignore unmerged entries in patch mode

295 + (merged to 'next' on 2012-04-12 at e65ceb1)

296 + + add--interactive: ignore unmerged entries in patch mode

297

298 Excludes conflicted paths from "add -p" processing, as it is not prepared

299 to handle them.

300

211 -Will merge to 'next'.

212 -

301 * bw/spawn-via-shell-path (2012-04-03) 1 commit

214 - - Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd

302 + (merged to 'next' on 2012-04-12 at 0ff833b)

303 + + Use SHELL_PATH from build system in run_command.c:prepare_shell_cmd

304

305 "sh" on the user's PATH may be utterly broken on some systems;

306 consistently use SHELL_PATH even from inside run-command API.

307

219 -Will merge to 'next'.

220 -

308 * jc/commit-unedited-template (2012-04-03) 5 commits

222 - - Documentation/git-commit: rephrase the "initial-ness" of templates

223 - - git-commit.txt: clarify -t requires editing message

224 - - commit: rephrase the error when user did not touch templated log message

225 - - commit: do not trigger bogus "has templated message edited" check

226 - - t7501: test the right kind of breakage

309 + (merged to 'next' on 2012-04-12 at a2e153b)

310 + + Documentation/git-commit: rephrase the "initial-ness" of templates

311 + + git-commit.txt: clarify -t requires editing message

312 + + commit: rephrase the error when user did not touch templated log message

313 + + commit: do not trigger bogus "has templated message edited" check

314 + + t7501: test the right kind of breakage

315

316 When "git commit --template F" errors out because the user did not touch

317 the message, it claimed that it aborts due to "empty message", which was

318 utterly wrong.

319

232 -Will merge to 'next'.

233 -

320 * jc/push-upstream-sanity (2012-04-05) 1 commit

235 - - push: error out when the "upstream" semantics does not make sense

321 + (merged to 'next' on 2012-04-12 at 288e1ad)

322 + + push: error out when the "upstream" semantics does not make sense

323

324 Fix broken 'push to upstream' implementation. "git push $there" without

325 refspec, when the current branch is set to push to a remote different from

326 $there, used to push to $there using the upstream information to a remote

327 unreleated to $there.

328

242 -Will merge to 'next'.

243 -

329 * jk/http-backend-keep-committer-ident-env (2012-03-30) 1 commit

245 - - http-backend: respect existing GIT_COMMITTER_* variables

330 + (merged to 'next' on 2012-04-12 at b2d0136)

331 + + http-backend: respect existing GIT_COMMITTER_* variables

332

333 The smart-http backend used to always override GIT_COMMITTER_* variables

334 with REMOTE_USER and REMOTE_ADDR.

335

250 -Will merge to 'next'.

251 -

252 -* mk/gitweb-diff-hl (2012-04-05) 8 commits

336 +* mk/gitweb-diff-hl (2012-04-11) 8 commits

337 - gitweb: Refinement highlightning in combined diffs

338 - gitweb: Highlight interesting parts of diff

339 - gitweb: Push formatting diff lines to print_diff_chunk()

@@ -259,7 +343,7 @@ Will merge to 'next'.

343 - gitweb: esc_html_hl_regions(): Don't create empty <span> elements

344 - gitweb: Use descriptive names in esc_html_hl_regions()

345

262 -Rerolled.

346 +Will merge to 'next'.

347

348 * it/fetch-pack-many-refs (2012-04-10) 4 commits

349 - remote-curl: main test case for the OS command line overflow

@@ -275,82 +359,78 @@ Will merge to 'next'.

359

360 Will merge to 'next'.

361

278 -* rs/commit-list-sort-in-batch (2012-04-09) 3 commits

362 +* rs/commit-list-sort-in-batch (2012-04-11) 3 commits

363 - revision: insert unsorted, then sort in prepare_revision_walk()

364 - commit: use mergesort() in commit_list_sort_by_date()

365 - add mergesort() for linked lists

366

367 +Will merge to 'next'.

368 +

369 * hv/submodule-recurse-push (2012-03-30) 3 commits

370 - push: teach --recurse-submodules the on-demand option

371 - Refactor submodule push check to use string list instead of integer

372 - Teach revision walking machinery to walk multiple times sequencially

373

374 +Will merge to 'next'.

375 +

376 * jk/branch-quiet (2012-03-26) 2 commits

289 - - teach "git branch" a --quiet option

290 - - checkout: suppress tracking message with "-q"

377 + (merged to 'next' on 2012-04-12 at 7d0a438)

378 + + teach "git branch" a --quiet option

379 + + checkout: suppress tracking message with "-q"

380

381 Even with "-q"uiet option, "checkout" used to report setting up tracking.

382 Also "branch" learns "-q"uiet option to squelch informational message.

383

295 -Will merge to 'next'.

296 -

384 * jk/run-command-eacces (2012-04-05) 2 commits

298 - - run-command: treat inaccessible directories as ENOENT

299 - - compat/mingw.[ch]: Change return type of exec functions to int

385 + (merged to 'next' on 2012-04-12 at ef3782e)

386 + + run-command: treat inaccessible directories as ENOENT

387 + + compat/mingw.[ch]: Change return type of exec functions to int

388

389 When PATH contains an unreadable directory, alias expansion code did not

390 kick in, and failed with an error that said "git-subcmd" was not found.

391

304 -Will merge to 'next'.

305 -

392 * jb/am-include (2012-03-28) 1 commit

307 - - am: support --include option

308 -

309 -Will merge to 'next'.

393 + (merged to 'next' on 2012-04-12 at ddbf96d)

394 + + am: support --include option

395

396 * jc/am-report-3way (2012-03-28) 1 commit

312 - - am -3: list the paths that needed 3-way fallback

313 -

314 -Will merge to 'next'.

397 + (merged to 'next' on 2012-04-12 at cf5d599)

398 + + am -3: list the paths that needed 3-way fallback

399

400 * rs/combine-diff-zero-context-at-the-beginning (2012-03-25) 1 commit

317 - - combine-diff: fix loop index underflow

401 + (merged to 'next' on 2012-04-12 at b4d92e3)

402 + + combine-diff: fix loop index underflow

403

404 Fixes an age old corner case bug in combine diff (only triggered with -U0

405 and the hunk at the beginning of the file needs to be shown).

406

322 -Will merge to 'next'.

323 -

407 * sl/autoconf (2012-03-26) 3 commits

325 - - configure: be more idiomatic

326 - - configure: avoid some code repetitions thanks to m4_{push,pop}def

327 - - configure: move definitions of private m4 macros before AC_INIT invocation

408 + (merged to 'next' on 2012-04-12 at 68f346d)

409 + + configure: be more idiomatic

410 + + configure: avoid some code repetitions thanks to m4_{push,pop}def

411 + + configure: move definitions of private m4 macros before AC_INIT invocation

412

413 Updates our configure.ac to follow a better "autoconf" style.

414

331 -Will merge to 'next'.

332 -

415 * wk/gitweb-snapshot-use-if-modified-since (2012-03-30) 3 commits

334 - - gitweb: add If-Modified-Since handling to git_snapshot().

335 - - gitweb: refactor If-Modified-Since handling

336 - - gitweb: add `status` headers to git_feed() responses.

416 + (merged to 'next' on 2012-04-12 at 611d318)

417 + + gitweb: add If-Modified-Since handling to git_snapshot().

418 + + gitweb: refactor If-Modified-Since handling

419 + + gitweb: add `status` headers to git_feed() responses.

420

421 Makes 'snapshot' request to "gitweb" honor If-Modified-Since: header,

422 based on the commit date.

423

341 -Will merge to 'next'.

342 -

424 * jk/diff-no-rename-empty (2012-03-23) 4 commits

344 - - merge-recursive: don't detect renames of empty files

345 - - teach diffcore-rename to optionally ignore empty content

346 - - make is_empty_blob_sha1 available everywhere

347 - - drop casts from users EMPTY_TREE_SHA1_BIN

425 + (merged to 'next' on 2012-04-12 at d1d95c5)

426 + + merge-recursive: don't detect renames of empty files

427 + + teach diffcore-rename to optionally ignore empty content

428 + + make is_empty_blob_sha1 available everywhere

429 + + drop casts from users EMPTY_TREE_SHA1_BIN

430

431 Forbids rename detection logic from matching two empty files as renames

432 during merge-recursive to prevent mismerges.

433

352 -Will merge to 'next'.

353 -

434 * th/difftool-diffall (2012-04-04) 8 commits

435 - difftool: print list of valid tools with '--tool-help'

436 - difftool: teach difftool to handle directory diffs

@@ -364,21 +444,24 @@ Will merge to 'next'.

444 Rolls the two-directory-diff logic from diffall script (in contrib/) into

445 "git difftool" framework.

446

447 +Still being reworked.

448 +

449 * jc/maint-clean-nested-worktree-in-subdir (2012-03-15) 2 commits

368 - (merged to 'next' on 2012-03-20 at fb5485e)

450 + (merged to 'next' on 2012-04-12 at 280a6e5)

451 + clean: preserve nested git worktree in subdirectories

452 + remove_dir_recursively(): Add flag for skipping removal of toplevel dir

453 (this branch is tangled with jh/notes-merge-in-git-dir-worktree.)

454

455 +Originally merged to 'next' on 2012-03-20

456 +

457 "git clean -d -f" (not "-d -f -f") is supposed to protect nested working

458 trees of independent git repositories that exist in the current project

459 working tree from getting removed, but the protection applied only to such

460 working trees that are at the top-level of the current project by mistake.

461

378 -Will merge to 'next'.

379 -

380 -* ct/advise-push-default (2012-03-26) 2 commits

381 - (merged to 'next' on 2012-03-28 at 62764ae)

462 +* ct/advise-push-default (2012-04-12) 3 commits

463 + (merged to 'next' on 2012-04-12 at b0613cd)

464 + + Fix httpd tests that broke when non-ff push advice changed

465 + clean up struct ref's nonfastforward field

466 + push: Provide situational hints for non-fast-forward errors

467

@@ -386,16 +469,14 @@ Breaks down the cases in which "git push" fails due to non-ff into three

469 categories, and gives separate advise messages. This should be a good

470 change regardless of mm/push-default-switch-warning topic.

471

389 -Will merge to 'next'.

390 -

472 * nl/rebase-i-cheat-sheet (2012-03-20) 1 commit

392 - (merged to 'next' on 2012-03-20 at 3092a2b)

473 + (merged to 'next' on 2012-04-12 at cd76fcb)

474 + rebase -i: remind that the lines are top-to-bottom

475

395 -Will merge to 'next'.

476 +Originally merged to 'next' on 2012-03-20

477

478 * da/difftool-test (2012-03-19) 1 commit

398 - (merged to 'next' on 2012-03-20 at 0ada7d4)

479 + (merged to 'next' on 2012-04-11 at f245c01)

480 + t7800: Test difftool passing arguments to diff

481

482 Makes sure "difftool" options can be given in any order.

@@ -403,13 +484,15 @@ Makes sure "difftool" options can be given in any order.

484 Will merge to 'master'.

485

486 * jh/notes-merge-in-git-dir-worktree (2012-03-15) 4 commits

406 - (merged to 'next' on 2012-03-20 at 0c1b1de)

487 + (merged to 'next' on 2012-04-11 at 6042ef5)

488 + notes-merge: Don't remove .git/NOTES_MERGE_WORKTREE; it may be the user's cwd

489 + notes-merge: use opendir/readdir instead of using read_directory()

490 + t3310: illustrate failure to "notes merge --commit" inside $GIT_DIR/

491 + remove_dir_recursively(): Add flag for skipping removal of toplevel dir

492 (this branch is tangled with jc/maint-clean-nested-worktree-in-subdir.)

493

494 +Originally merged to 'next' on 2012-03-20

495 +

496 Running "notes merge --commit" failed to perform correctly when run

497 from any directory inside $GIT_DIR/. When "notes merge" stops with

498 conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits

@@ -418,7 +501,7 @@ to resolve it.

501 Will merge to 'master'.

502

503 * jn/diffstat-tests (2012-03-13) 7 commits

421 - (merged to 'next' on 2012-03-20 at 8791b2f)

504 + (merged to 'next' on 2012-04-11 at 7365e41)

505 + diffstat summary line varies by locale: miscellany

506 + test: use numstat instead of diffstat in binary-diff test

507 + test: use --numstat instead of --stat in "git stash show" tests

@@ -427,37 +510,45 @@ Will merge to 'master'.

510 + test: use numstat instead of diffstat in funny-names test

511 + test: use test_i18ncmp when checking --stat output

512

513 +Originally merged to 'next' on 2012-03-20

514 +

515 Some tests checked the "diff --stat" output when they do not have to,

516 which unnecessarily made things harder to verify under GETTEXT_POISON.

517

518 Will merge to 'master'.

519

520 * tr/maint-word-diff-regex-sticky (2012-03-14) 3 commits

436 - (merged to 'next' on 2012-03-20 at b3f67cd)

521 + (merged to 'next' on 2012-04-11 at 24d14de)

522 + diff: tweak a _copy_ of diff_options with word-diff

523 + diff: refactor the word-diff setup from builtin_diff_cmd

524 + t4034: diff.*.wordregex should not be "sticky" in --word-diff

525

526 +Originally merged to 'next' on 2012-03-20

527 +

528 The regexp configured with wordregex was incorrectly reused across

529 files.

530

531 Will merge to 'master'.

532

533 * zj/test-cred-helper-nicer-prove (2012-03-15) 2 commits

447 - (merged to 'next' on 2012-03-20 at b675ec1)

534 + (merged to 'next' on 2012-04-11 at 9169614)

535 + t0303: resurrect commit message as test documentation

536 + t0303: immediately bail out w/o GIT_TEST_CREDENTIAL_HELPER

537

538 +Originally merged to 'next' on 2012-03-20

539 +

540 Minor improvement to t0303.

541 Will merge to 'master'.

542

543 * jc/commit-hook-authorship (2012-03-11) 3 commits

455 - (merged to 'next' on 2012-03-12 at 05ca7f8)

544 + (merged to 'next' on 2012-04-11 at 15ec4d4)

545 + commit: pass author/committer info to hooks

546 + t7503: does pre-commit-hook learn authorship?

547 + ident.c: add split_ident_line() to parse formatted ident line

548 (this branch is tangled with jc/run-hook-env-1.)

549

550 +Originally merged to 'next' on 2012-03-12

551 +

552 "git commit --author=$name" did not tell the name that was being

553 recorded in the resulting commit to hooks, even though it does do so

554 when the end user overrode the authorship via the "GIT_AUTHOR_NAME"

@@ -477,25 +568,27 @@ Updates run_hook() API to be much less specific to "commit". It would

568 only be useful if people start doing more interesting things with hooks.

569

570 * jc/diff-algo-cleanup (2012-02-19) 2 commits

480 - (merged to 'next' on 2012-03-15 at cca0032)

571 + (merged to 'next' on 2012-04-11 at f2c6b9a)

572 + xdiff: PATIENCE/HISTOGRAM are not independent option bits

573 + xdiff: remove XDL_PATCH_* macros

574

575 +Originally merged to 'next' on 2012-03-15

576 +

577 Resurrects the preparatory clean-up patches from another topic that was

578 discarded, as this would give a saner foundation to build on diff.algo

579 configuration option series.

580

581 Will merge to 'master'.

582

490 -* rs/unpack-trees-leakfix (2012-03-06) 1 commit

491 - (merged to 'next' on 2012-03-07 at 69a69cd)

583 +* rs/unpack-trees-leakfix (2012-04-10) 2 commits

584 + (merged to 'next' on 2012-04-12 at 6958b54)

585 + unpack-trees: plug minor memory leak

586 + + unpack-trees: don't perform any index operation if we're not merging

587

494 -Will sneak a fix-up under this one when I rebuild 'next' tomorrow.

588 +Originally merged to 'next' on 2012-03-07

589

590 * mm/push-default-switch-warning (2012-03-09) 1 commit

497 - (merged to 'next' on 2012-03-28 at 074b16b)

498 - + push: start warning upcoming default change for push.default

591 + - push: start warning upcoming default change for push.default

592

593 This resurrects an ancient patch I wrote during a discussion we had in the

594 1.6.3-1.6.4 era. This should probably come after ct/advise-push-default

@@ -505,29 +598,14 @@ the future default change into account.

598 Will kick back to 'pu'.

599

600 * jc/fmt-merge-msg-people (2012-03-13) 1 commit

508 - - fmt-merge-msg: show those involved in a merged series

601 + (merged to 'next' on 2012-04-12 at 4c2031c)

602 + + fmt-merge-msg: show those involved in a merged series

603

604 The "fmt-merge-msg" command learns to list the primary contributors

605 involved in the side topic you are merging.

606

513 -Will merge to 'next'.

514 -

515 -* nl/http-proxy-more (2012-04-10) 6 commits

516 - - fixup? 6e17b8c

517 - (merged to 'next' on 2012-03-20 at c004001)

518 - + http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

519 - + http: Avoid limit of retrying request only twice

520 - + http: handle proxy authentication failure (error 407)

521 - + http: handle proxy proactive authentication

522 - + http: try http_proxy env var when http.proxy config option is not set

523 -

524 -The code to talk to http proxies learn to use the same credential

525 -API used to talk to the final http destinations.

526 -

527 -Will kick back to 'pu'.

528 -

607 * nd/stream-more (2012-03-07) 7 commits

530 - (merged to 'next' on 2012-03-07 at 7325922)

608 + (merged to 'next' on 2012-04-11 at b17684d)

609 + update-server-info: respect core.bigfilethreshold

610 + fsck: use streaming API for writing lost-found blobs

611 + show: use streaming API for showing blobs

@@ -536,6 +614,8 @@ Will kick back to 'pu'.

614 + Add more large blob test cases

615 + streaming: make streaming-write-entry to be more reusable

616

617 +Originally merged to 'next' on 2012-03-07

618 +

619 Use API to read blob data in smaller chunks in more places to

620 reduce the memory footprint. In general, looked fairly good.

621

What's cooking (2012/04 #05)