4c5ca0d125 · matheusbsbs/matheus-bagliano

@@ -1,30 +1,20 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Mar 2015, #09; Thu, 26)

4 -X-master-at: 2dfb2e07cb0cb979f630643b57dca579a0359a9d

5 -X-next-at: 1e1e5fdfb345c0ff9265604de8d64ca01d55f26a

3 +Subject: What's cooking in git.git (Apr 2015, #01; Thu, 2)

4 +X-master-at: 6ae0d972664134b82a6dd164a01e8adbebeaffe3

5 +X-next-at: 85735d76ca4ac11dd4059dfd973b4df8b42f8776

6

7 -What's cooking in git.git (Mar 2015, #09; Thu, 26)

7 +What's cooking in git.git (Apr 2015, #01; Thu, 2)

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 -Good news is that a few GSoC Microprojects have been merged already

15 -to 'master'; from my vague recollection of past years, perhaps this

16 -year's batch of students are of better quality? I dunno, but it

17 -that is the case, it is a welcome change.

18 -

19 -A preview release 2.4-rc0 has been tagged. I do not expect no major

20 -topics to graduate to 'master' before the final; many topics in

21 -'next' touch important issues and crucial code paths and I'd prefer

22 -to see them cooked in 'next' for a few more weeks, rather than

23 -merging them early and having to make last-minute reverts for the

24 -upcoming release.

25 -

26 -I'll also start dropping stalled topics from 'pu' as part of spring

27 -cleaning.

14 +The first release candidate 2.4-rc1 has been tagged. I'll still

15 +take small and trivial fixes and documentation updates but let's

16 +really shift our focus to find and fix (or revert) regressions

17 +that may have happened during this cycle.

18

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

20 of the repositories listed at

@@ -32,232 +22,180 @@ of the repositories listed at

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

23

24 --------------------------------------------------

35 -[Graduated to "master"]

25 +[New Topics]

26

37 -* ct/prompt-untracked-fix (2015-03-15) 1 commit

38 - (merged to 'next' on 2015-03-20 at 0d57eaf)

39 - + git prompt: use toplevel to find untracked files

27 +* va/fix-git-p4-tests (2015-03-28) 2 commits

28 + - git-p4: fix copy detection test

29 + - t9814: fix broken shell syntax in git-p4 rename test

30

41 - The prompt script (in contrib/) did not show the untracked sign

42 - when working in a subdirectory without any untracked files.

31 + Test fixes for git-p4

32

33 + Will merge to 'next'.

34

45 -* dj/log-graph-with-no-walk (2015-03-19) 1 commit

46 - (merged to 'next' on 2015-03-20 at cb636c0)

47 - + revision: forbid combining --graph and --no-walk

35

49 - "git log --graph --no-walk A B..." is a otcnflicting request that

50 - asks nonsense; no-walk tells us show discrete points in the

51 - history, while graph asks to draw connections between these

52 - discrete points. Forbid the combination.

53 -

54 -

55 -* jc/report-path-error-to-dir (2015-03-24) 1 commit

56 - (merged to 'next' on 2015-03-24 at 6e97221)

57 - + report_path_error(): move to dir.c

58 -

59 - Code clean-up.

60 -

61 -

62 -* jc/submitting-patches-mention-send-email (2015-03-15) 1 commit

63 - (merged to 'next' on 2015-03-23 at a9581fd)

64 - + SubmittingPatches: encourage users to use format-patch and send-email

65 -

66 - Recommend format-patch and send-email for those who want to submit

67 - patches to this project.

68 -

69 -

70 -* jk/cleanup-failed-clone (2015-03-19) 2 commits

71 - (merged to 'next' on 2015-03-23 at 1f26d93)

72 - + clone: drop period from end of die_errno message

73 - + clone: initialize atexit cleanup handler earlier

74 -

75 - An failure early in the "git clone" that started creating the

76 - working tree and repository could have resulted in some directories

77 - and files left without getting cleaned up.

78 -

79 -

80 -* jk/fetch-pack (2015-03-19) 4 commits

81 - (merged to 'next' on 2015-03-23 at 4357f3d)

82 - + fetch-pack: remove dead assignment to ref->new_sha1

83 - + fetch_refs_via_pack: free extra copy of refs

84 - + filter_ref: make a copy of extra "sought" entries

85 - + filter_ref: avoid overwriting ref->old_sha1 with garbage

86 -

87 - "git fetch" that fetches a commit using the allow-tip-sha1-in-want

88 - extension could have failed to fetch all the requested refs.

89 -

90 -

91 -* jk/prune-with-corrupt-refs (2015-03-20) 5 commits

92 - (merged to 'next' on 2015-03-23 at 68af8a9)

93 - + refs.c: drop curate_packed_refs

94 - + repack: turn on "ref paranoia" when doing a destructive repack

95 - + prune: turn on ref_paranoia flag

96 - + refs: introduce a "ref paranoia" flag

97 - + t5312: test object deletion code paths in a corrupted repository

36 +* va/p4-client-path (2015-03-28) 2 commits

37 + - git-p4: improve client path detection when branches are used

38 + - t9801: check git-p4's branch detection and client view together

39

99 - "git prune" used to largely ignore broken refs when deciding which

100 - objects are still being used, which could spread an existing small

101 - damage and make it a larger one.

40 + Attempt to better handle branches in perforce by git p4

41 + Reviews by git-p4 experts are very much appreciated.

42

43

104 -* jk/run-command-capture (2015-03-22) 7 commits

105 - (merged to 'next' on 2015-03-23 at f6db88b)

106 - + run-command: forbid using run_command with piped output

107 - + trailer: use capture_command

108 - + submodule: use capture_command

109 - + wt-status: use capture_command

110 - + run-command: introduce capture_command helper

111 - + wt_status: fix signedness mismatch in strbuf_read call

112 - + wt-status: don't flush before running "submodule status"

113 -

114 - The run-command interface was easy to abuse and make a pipe for us

115 - to read from the process, wait for the process to finish and then

116 - attempt to read its output, which is a pattern that lead to a

117 - deadlock. Fix such uses by introducing a helper to do this

118 - correctly (i.e. we need to read first and then wait the process to

119 - finish) and also add code to prevent such abuse in the run-command

120 - helper.

44 +* iu/fix-parse-options-h-comment (2015-03-29) 1 commit

45 + (merged to 'next' on 2015-04-02 at 7fd3cef)

46 + + parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval

47

48 + Will merge to 'master'.

49

123 -* jk/simplify-csum-file-sha1fd-check (2015-03-19) 1 commit

124 - (merged to 'next' on 2015-03-20 at 6f6d1c2)

125 - + sha1fd_check: die when we cannot open the file

50

127 - Code simplification.

51 +* jk/at-push-sha1 (2015-03-31) 6 commits

52 + - sha1_name: implement @{push} shorthand

53 + - sha1_name: refactor upstream_mark

54 + - remote.c: provide per-branch pushremote name

55 + - remote.c: hoist branch.*.remote lookup out of remote_get_1

56 + - remote.c: drop "remote" pointer from "struct branch"

57 + - remote.c: drop default_remote_name variable

58

59

130 -* jk/test-chain-lint (2015-03-25) 36 commits

131 - (merged to 'next' on 2015-03-25 at 011a687)

132 - + t9001: drop save_confirm helper

133 - + t0020: use test_* helpers instead of hand-rolled messages

134 - + t: simplify loop exit-code status variables

135 - + t: fix some trivial cases of ignored exit codes in loops

136 - + t7701: fix ignored exit code inside loop

137 - + t3305: fix ignored exit code inside loop

138 - + t0020: fix ignored exit code inside loops

139 - + perf-lib: fix ignored exit code inside loop

140 - (merged to 'next' on 2015-03-24 at 31df637)

141 - + t6039: fix broken && chain

142 - + t9158, t9161: fix broken &&-chain in git-svn tests

143 - + t9104: fix test for following larger parents

144 - + t4104: drop hand-rolled error reporting

145 - + t0005: fix broken &&-chains

146 - + t7004: fix embedded single-quotes

147 - + t0050: appease --chain-lint

148 - + t9001: use test_when_finished

149 - + t4117: use modern test_* helpers

150 - + t6034: use modern test_* helpers

151 - + t1301: use modern test_* helpers

152 - + t0020: use modern test_* helpers

153 - + t6030: use modern test_* helpers

154 - + t9502: fix &&-chain breakage

155 - + t7201: fix &&-chain breakage

156 - + t3600: fix &&-chain breakage for setup commands

157 - + t: avoid using ":" for comments

158 - + t: wrap complicated expect_code users in a block

159 - + t: use test_expect_code instead of hand-rolled comparison

160 - + t: use test_might_fail for diff and grep

161 - + t: fix &&-chaining issues around setup which might fail

162 - + t: use test_must_fail instead of hand-rolled blocks

163 - + t: use verbose instead of hand-rolled errors

164 - + t: assume test_cmp produces verbose output

165 - + t: fix trivial &&-chain breakage

166 - + t: fix moderate &&-chain breakage

167 - + t: fix severe &&-chain breakage

168 - + t/test-lib: introduce --chain-lint option

169 -

170 - People often forget to chain the commands in their test together

171 - with &&, leaving a failure from an earlier command in the test go

172 - unnoticed. The new GIT_TEST_CHAIN_LINT mechanism allows you to

173 - catch such a mistake more easily.

174 -

175 -

176 -* kd/rev-list-bisect-first-parent (2015-03-19) 1 commit

177 - (merged to 'next' on 2015-03-20 at 5477bf5)

178 - + rev-list: refuse --first-parent combined with --bisect

179 -

180 - "git rev-list --bisect --first-parent" does not work (yet) and can

181 - even cause SEGV; forbid it. "git log --bisect --first-parent"

182 - would not be useful until "git bisect --first-parent" materializes,

183 - so it is also forbidden for now.

184 -

185 -

186 -* nd/doc-git-index-version (2015-03-24) 1 commit

187 - + git.txt: list index versions in plain English

188 -

189 - Doc clean-up.

190 -

191 -

192 -* sg/completion-gitcomp-nl-for-refs (2015-03-22) 1 commit

193 - (merged to 'next' on 2015-03-25 at b095b79)

194 - + completion: use __gitcomp_nl() for completing refs

195 -

196 - Code clean-up.

197 -

198 -

199 -* tg/fix-check-order-with-split-index (2015-03-20) 1 commit

200 - (merged to 'next' on 2015-03-23 at c361f8e)

201 - + read-cache: fix reading of split index

202 -

203 - The split-index mode introduced at v2.3.0-rc0~41 was broken in the

204 - codepath to protect us against a broken reimplementation of Git

205 - that writes an invalid index with duplicated index entries, etc.

206 -

207 -

208 -* tg/test-index-v4 (2015-03-20) 1 commit

209 - (merged to 'next' on 2015-03-23 at 6b2eb0a)

210 - + t1700: make test pass with index-v4

211 -

212 - A test fix.

213 -

214 -

215 -* ws/grep-quiet-no-pager (2015-03-19) 1 commit

216 - (merged to 'next' on 2015-03-20 at b3f5fe6)

217 - + grep: fix "--quiet" overwriting current output

218 -

219 - Even though "git grep --quiet" is run merely to ask for the exit

220 - status, we spawned the pager regardless. Stop doing that.

60 +* jk/cherry-pick-docfix (2015-03-30) 1 commit

61 + (merged to 'next' on 2015-04-02 at 40da1d7)

62 + + cherry-pick: fix docs describing handling of empty commits

63

222 ---------------------------------------------------

223 -[New Topics]

64 + Will merge to 'master'.

65

225 -* pt/credential-xdg (2015-03-25) 4 commits

226 - (merged to 'next' on 2015-03-25 at 765128e)

227 - + t0302: "unreadable" test needs POSIXPERM

228 - (merged to 'next' on 2015-03-24 at 9a3706e)

229 - + t0302: test credential-store support for XDG_CONFIG_HOME

230 - + git-credential-store: support XDG_CONFIG_HOME

231 - + git-credential-store: support multiple credential files

66

233 - Tweak the sample "store" backend of the credential helper to honor

234 - XDG configuration file locations when specified.

67 +* jk/sha1-file-reduce-useless-warnings (2015-03-30) 1 commit

68 + - sha1_file: squelch "packfile cannot be accessed" warnings

69

236 - As this may see further updates, and also this is not an urgent

237 - issue anyway, I'll give it a bit more time for it to simmer.

70

239 - Will cook in 'next'.

71 +* jz/gitweb-conf-doc-fix (2015-03-31) 1 commit

72 + (merged to 'next' on 2015-04-02 at 237d1bc)

73 + + gitweb.conf.txt: say "build-time", not "built-time"

74

75 + Will merge to 'master'.

76

242 -* jc/merge-deprecate-old-syntax (2015-03-26) 2 commits

243 - - merge: drop 'git merge <message> HEAD <commit>' syntax

244 - - merge: deprecate 'git merge <message> HEAD <commit>' syntax

77

246 - An RFC to really start the process of removing the ancient syntax

247 - to invoke a two-way merge, which has been deprecated since October

248 - 2007.

78 +* mh/show-branch-topic (2015-03-31) 1 commit

79 + - show-branch: show all local heads when only giving one rev along --topics

80 +

81 + "git show-branch --topics HEAD" (with no other arguments) did not

82 + do anything interesting. Instead, contrast the given revision

83 + against all the local branches by default.

84 +

85 + Will merge to 'next'.

86 +

87 +

88 +* pt/enter-repo-comment-fix (2015-03-31) 1 commit

89 + (merged to 'next' on 2015-04-02 at 276ad7e)

90 + + enter_repo(): fix docs to match code

91 +

92 + Will merge to 'master'.

93 +

94 +

95 +* sb/line-log-plug-pairdiff-leak (2015-03-30) 1 commit

96 + - line-log.c: fix a memleak

97 +

98 + Will merge to 'next'.

99

100

101 +* sb/plug-wt-shortstatus-tracking-leak (2015-03-30) 1 commit

102 + - wt-status.c: fix a memleak

103 +

104 + Will merge to 'next'.

105 +

106 +

107 +* jc/push-cert (2015-04-02) 1 commit

108 + - push --signed: tighten what the receiving end can ask to sign

109 +

110 + The "git push --signed" protocol extension did not limit what the

111 + "nonce" that is a server-chosen string can contain or how long it

112 + can be, which was unnecessarily lax. Limit both the length and the

113 + alphabet to a reasonably small space that can still have enough

114 + entropy.

115 +

116 + Will merge to 'next'.

117 +

118 +

119 +* jc/update-instead-into-void (2015-04-01) 1 commit

120 + - push-to-deploy: allow pushing into an unborn branch and updating it

121 +

122 + A push into an unborn branch, with "receive.denyCurrentBranch" set

123 + to "updateInstead", did not check out the working tree as expected.

124 +

125 + Will merge to 'next'.

126 +

127 +

128 +* jk/init-core-worktree-at-root (2015-04-02) 1 commit

129 + - init: don't set core.worktree when initializing /.git

130 +

131 + We avoid setting core.worktree when the repository location is the

132 + ".git" directory directly at the top level of the working tree, but

133 + the code misdetected the case in which the working tree is at the

134 + root level of the filesystem (which arguably is a silly thing to

135 + do, but still valid).

136 +

137 + Will merge to 'next'.

138 +

139 +

140 +* jk/pack-corruption-post-mortem (2015-04-01) 1 commit

141 + - howto: document more tools for recovery corruption

142 +

143 + Documentation update.

144 +

145 + Will merge to 'next'.

146 +

147 +

148 +* jn/doc-fast-import-no-16-octopus-limit (2015-03-31) 1 commit

149 + - fast-import doc: remove suggested 16-parent limit

150 +

151 + Documentation update.

152 +

153 + Will merge to 'next'.

154 +

155 +

156 +* sb/plug-streaming-leak (2015-03-31) 1 commit

157 + - streaming.c: fix a memleak

158 +

159 + Will merge to 'next'.

160 +

161 +

162 +* ts/checkout-advice-plural (2015-04-01) 1 commit

163 + - checkout: call a single commit “it” instead of “th

164 +

165 + Will merge to 'next'.

166 +

167 +--------------------------------------------------

168 +[Graduated to "master"]

169 +

170 * ph/push-doc-cas (2015-03-26) 1 commit

252 - - git-push.txt: clean up force-with-lease wording

171 + (merged to 'next' on 2015-03-27 at 0737697)

172 + + git-push.txt: clean up force-with-lease wording

173

254 - Will merge to 'next' and then to 'master'.

174 + Documentation update.

175

176

257 -* ss/pull-rebase-preserve (2015-03-26) 1 commit

258 - - docs: clarify "preserve" option wording for git-pull

177 +* sb/leaks (2015-03-24) 10 commits

178 + (merged to 'next' on 2015-03-24 at bdbc0c7)

179 + + http: release the memory of a http pack request as well

180 + (merged to 'next' on 2015-03-23 at 5397daf)

181 + + read-cache: fix memleak

182 + + add_to_index(): free unused cache-entry

183 + + commit.c: fix a memory leak

184 + + http-push: remove unneeded cleanup

185 + + merge-recursive: fix memleaks

186 + + merge-blobs.c: fix a memleak

187 + + builtin/apply.c: fix a memleak

188 + + update-index: fix a memleak

189 + + read-cache: free cache entry in add_to_index in case of early return

190 +

191 + Plug minor memory leaks everywhere.

192 +

193 +

194 +* ss/pull-rebase-preserve (2015-03-30) 2 commits

195 + + docs: clarify what git-rebase's "-p" / "--preserve-merges" does

196 + + docs: clarify "preserve" option wording for git-pull

197

260 - Will merge to 'next' and then to 'master'.

198 + Documentation update.

199

200 --------------------------------------------------

201 [Stalled]

@@ -316,19 +254,6 @@ of the repositories listed at

254 Need extra sets of eyes to review this.

255

256

319 -* ak/stash-store-create-help (2015-01-13) 1 commit

320 - - stash: show "create" and "store" subcommands in usage-help

321 -

322 - Will discard.

323 -

324 -

325 -* bp/diff-relative-config (2015-01-07) 2 commits

326 - - diff: teach diff.relative to give default to --relative=<value>

327 - - diff: teach --no-relative to override earlier --relative

328 -

329 - Will discard.

330 -

331 -

257 * jc/diff-b-m (2015-02-23) 5 commits

258 . WIPWIP

259 . WIP: diff-b-m

@@ -350,20 +275,6 @@ of the repositories listed at

275 Expecting a reroll.

276

277

353 -* je/quiltimport-no-fuzz (2014-10-21) 2 commits

354 - - git-quiltimport: flip the default not to allow fuzz

355 - - git-quiltimport.sh: allow declining fuzz with --exact option

356 -

357 - "quiltimport" drove "git apply" always with -C1 option to reduce

358 - context of the patch in order to give more chance to somewhat stale

359 - patches to apply. Add an "--exact" option to disable, and also

360 - "-C$n" option to customize this behaviour. The top patch

361 - optionally flips the default to "--exact".

362 -

363 - Tired of waiting for an Ack

364 - Will discard.

365 -

366 -

278 * tr/remerge-diff (2014-11-10) 9 commits

279 - t4213: avoid "|" in sed regexp

280 - log --remerge-diff: show what the conflict resolution changed

@@ -392,64 +303,6 @@ of the repositories listed at

303 Kicked back to 'pu' per request ($gmane/255610).

304

305

395 -* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits

396 - - SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks

397 - - git-add--interactive: Preserve diff heading when splitting hunks

398 -

399 - Tired of waiting for a reroll.

400 - Will discard.

401 -

402 -

403 -* jn/gitweb-utf8-in-links (2014-05-27) 1 commit

404 - - gitweb: Harden UTF-8 handling in generated links

405 -

406 - $gmane/250758?

407 - Will discard.

408 -

409 -

410 -* ss/userdiff-update-csharp-java (2014-06-02) 2 commits

411 - - userdiff: support Java try keyword

412 - - userdiff: support C# async methods and correct C# keywords

413 -

414 - Reviews sent; tired of waiting for a response.

415 - Will discard.

416 -

417 -

418 -* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit

419 - - git-rebase: print name of rev when using shorthand

420 -

421 - Teach "git rebase -" to report the concrete name of the branch

422 - (i.e. the previous one).

423 -

424 - But it stops short and does not do the same for "git rebase @{-1}".

425 - Tired of waiting for a reroll.

426 - Will discard.

427 -

428 -

429 -* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits

430 - - merge: drop unused arg from abort_commit method signature

431 - - merge: make prepare_to_commit responsible for write_merge_state

432 - - t7505: ensure cleanup after hook blocks merge

433 - - t7505: add missing &&

434 -

435 - Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that

436 - run during "git merge". The log message stresses too much on one

437 - hook, prepare-commit-msg, but it would equally apply to other hooks

438 - like post-merge, I think.

439 -

440 - Tired of waiting for a reroll.

441 - Will discard.

442 -

443 -

444 -* jc/graph-post-root-gap (2013-12-30) 3 commits

445 - - WIP: document what we want at the end

446 - - graph: remove unused code a bit

447 - - graph: stuff the current commit into graph->columns[]

448 -

449 - This was primarily a RFH ($gmane/239580).

450 - Will discard.

451 -

452 -

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

307 - perf-lib: add test_perf_cleanup target

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

@@ -472,30 +325,53 @@ of the repositories listed at

325 --------------------------------------------------

326 [Cooking]

327

475 -* jc/diff-no-index-d-f (2015-03-25) 2 commits

476 - - diff: align D/F handling of "diff --no-index" with that of normal Git

477 - - diff-no-index: DWIM "diff D F" into "diff D/F F"

328 +* pt/credential-xdg (2015-03-25) 4 commits

329 + (merged to 'next' on 2015-03-25 at 765128e)

330 + + t0302: "unreadable" test needs POSIXPERM

331 + (merged to 'next' on 2015-03-24 at 9a3706e)

332 + + t0302: test credential-store support for XDG_CONFIG_HOME

333 + + git-credential-store: support XDG_CONFIG_HOME

334 + + git-credential-store: support multiple credential files

335

479 - The usual "git diff" when seeing a file turning into a directory

480 - showed a patchset to remove the file and create all files in the

481 - directory, but "git diff --no-index" simply refused to work.

336 + Tweak the sample "store" backend of the credential helper to honor

337 + XDG configuration file locations when specified.

338

483 - Will merge to and cook in 'next', after reading it over once again.

339 + As this may see further updates, and also this is not an urgent

340 + issue anyway, I'll give it a bit more time for it to simmer.

341

342 + Will cook in 'next'.

343

486 -* ts/man-pdf (2015-03-20) 1 commit

487 - - Documentation: make 'make pdf' format manpages to PDF as well

344

489 - For offline consumption of manual pages, a target to produce one

490 - pdf document per manual page was added to Documentation/Makefile.

345 +* jc/merge-deprecate-old-syntax (2015-03-26) 1 commit

346 + - merge: deprecate 'git merge <message> HEAD <commit>' syntax

347 + (this branch is used by jc/merge-drop-old-syntax.)

348

492 - Its usefulness is unknown, given that this does not produce a

493 - single document with all the manual pages in it, which would be not

494 - much better than keeping a bunch of HTML manual pages we already

495 - produce and use them instead for offline consumption.

349 + The first step to really start the process of removing the ancient

350 + syntax to invoke a two-way merge, which has been deprecated since

351 + October 2007.

352

497 - Will discard, while leaving a single-document target as an open

498 - possibility.

353 +

354 +* jc/merge-drop-old-syntax (2015-03-26) 1 commit

355 + - merge: drop 'git merge <message> HEAD <commit>' syntax

356 + (this branch uses jc/merge-deprecate-old-syntax.)

357 +

358 + Stop supporting "git merge <messsage> HEAD <commit>" syntax that

359 + has been deprecated since October 2007.

360 +

361 +

362 +* jc/diff-no-index-d-f (2015-03-26) 2 commits

363 + (merged to 'next' on 2015-03-27 at 1f270f9)

364 + + diff-no-index: align D/F handling with that of normal Git

365 + + diff-no-index: DWIM "diff D F" into "diff D/F F"

366 +

367 + The usual "git diff" when seeing a file turning into a directory

368 + showed a patchset to remove the file and create all files in the

369 + directory, but "git diff --no-index" simply refused to work. Also,

370 + when asked to compare a file and a directory, imitate POSIX "diff"

371 + and compare the file with the file with the same name in the

372 + directory, instead of refusing to run.

373 +

374 + Will cook in 'next'.

375

376

377 * nd/diff-i-t-a (2015-03-23) 1 commit

@@ -517,23 +393,6 @@ of the repositories listed at

393 Will cook in 'next', as this brings in a new world order.

394

395

520 -* sb/leaks (2015-03-24) 10 commits

521 - (merged to 'next' on 2015-03-24 at bdbc0c7)

522 - + http: release the memory of a http pack request as well

523 - (merged to 'next' on 2015-03-23 at 5397daf)

524 - + read-cache: fix memleak

525 - + add_to_index(): free unused cache-entry

526 - + commit.c: fix a memory leak

527 - + http-push: remove unneeded cleanup

528 - + merge-recursive: fix memleaks

529 - + merge-blobs.c: fix a memleak

530 - + builtin/apply.c: fix a memleak

531 - + update-index: fix a memleak

532 - + read-cache: free cache entry in add_to_index in case of early return

533 -

534 - Will merge to 'master'.

535 -

536 -

396 * mh/numparse (2015-03-19) 14 commits

397 - diff_opt_parse(): use convert_i() when handling --abbrev=<num>

398 - diff_opt_parse(): use convert_i() when handling "-l<num>"

@@ -675,7 +534,9 @@ of the repositories listed at

534 Expecting a reroll.

535

536

678 -* nd/multiple-work-trees (2015-03-24) 40 commits

537 +* nd/multiple-work-trees (2015-03-31) 41 commits

538 + (merged to 'next' on 2015-04-02 at 7ea51b4)

539 + + prune --worktrees: fix expire vs worktree existence condition

540 (merged to 'next' on 2015-03-24 at 58b5a60)

541 + t1501: fix test with split index

542 (merged to 'next' on 2015-03-20 at cc98ed0)

@@ -725,3 +586,83 @@ of the repositories listed at

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

587

588 Will cook in 'next'.

589 +

590 +--------------------------------------------------

591 +[Discarded]

592 +

593 +* ak/stash-store-create-help (2015-01-13) 1 commit

594 + . stash: show "create" and "store" subcommands in usage-help

595 +

596 +

597 +* bp/diff-relative-config (2015-01-07) 2 commits

598 + . diff: teach diff.relative to give default to --relative=<value>

599 + . diff: teach --no-relative to override earlier --relative

600 +

601 +

602 +* je/quiltimport-no-fuzz (2014-10-21) 2 commits

603 + . git-quiltimport: flip the default not to allow fuzz

604 + . git-quiltimport.sh: allow declining fuzz with --exact option

605 +

606 + "quiltimport" drove "git apply" always with -C1 option to reduce

607 + context of the patch in order to give more chance to somewhat stale

608 + patches to apply. Add an "--exact" option to disable, and also

609 + "-C$n" option to customize this behaviour. The top patch

610 + optionally flips the default to "--exact".

611 +

612 +

613 +* ab/add-interactive-show-diff-func-name (2014-05-12) 2 commits

614 + . SQUASH??? git-add--interactive: Preserve diff heading when splitting hunks

615 + . git-add--interactive: Preserve diff heading when splitting hunks

616 +

617 +

618 +* ss/userdiff-update-csharp-java (2014-06-02) 2 commits

619 + . userdiff: support Java try keyword

620 + . userdiff: support C# async methods and correct C# keywords

621 +

622 +

623 +* bg/rebase-off-of-previous-branch (2014-04-16) 1 commit

624 + . git-rebase: print name of rev when using shorthand

625 +

626 + Teach "git rebase -" to report the concrete name of the branch

627 + (i.e. the previous one).

628 +

629 + But it stops short and does not do the same for "git rebase @{-1}".

630 +

631 +

632 +* rb/merge-prepare-commit-msg-hook (2014-01-10) 4 commits

633 + . merge: drop unused arg from abort_commit method signature

634 + . merge: make prepare_to_commit responsible for write_merge_state

635 + . t7505: ensure cleanup after hook blocks merge

636 + . t7505: add missing &&

637 +

638 + Expose more merge states (e.g. $GIT_DIR/MERGE_MODE) to hooks that

639 + run during "git merge". The log message stresses too much on one

640 + hook, prepare-commit-msg, but it would equally apply to other hooks

641 + like post-merge, I think.

642 +

643 +

644 +* jc/graph-post-root-gap (2013-12-30) 3 commits

645 + . WIP: document what we want at the end

646 + . graph: remove unused code a bit

647 + . graph: stuff the current commit into graph->columns[]

648 +

649 + This was primarily a RFH ($gmane/239580).

650 +

651 +

652 +* ts/man-pdf (2015-03-20) 1 commit

653 + . Documentation: make 'make pdf' format manpages to PDF as well

654 +

655 + For offline consumption of manual pages, a target to produce one

656 + pdf document per manual page was added to Documentation/Makefile.

657 +

658 + Its usefulness is unknown, given that this does not produce a

659 + single document with all the manual pages in it, which would be not

660 + much better than keeping a bunch of HTML manual pages we already

661 + produce and use them instead for offline consumption.

662 +

663 + Discarded, while leaving a single-document target as an open

664 + possibility.

665 +

666 +

667 +* jn/gitweb-utf8-in-links (2014-05-27) 1 commit

668 + . gitweb: Harden UTF-8 handling in generated links

What's cooking (2015/04 #01)