1957483686 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Mar 2015, #08; Mon, 23)

4 -X-master-at: f53fc38c083da1a1d14f54713ffd8fd0965a2194

5 -X-next-at: b1122c2910374ef5dde8cb25b25be0abb1538aba

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

4 +X-master-at: 2dfb2e07cb0cb979f630643b57dca579a0359a9d

5 +X-next-at: 1e1e5fdfb345c0ff9265604de8d64ca01d55f26a

6

7 -What's cooking in git.git (Mar 2015, #08; Mon, 23)

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

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 -This cycle is turning out to be a "shoot for product excellence"

15 -release. About half of the commits that have been merged to the

16 -'master' so far have also been merged to 'maint' and v2.3.4 has been

17 -tagged.

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.

28

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

30 of the repositories listed at

@@ -24,70 +34,71 @@ of the repositories listed at

34 --------------------------------------------------

35 [Graduated to "master"]

36

27 -* jk/push-config (2015-03-14) 4 commits

28 - (merged to 'next' on 2015-03-16 at 6452570)

29 - + push: allow --follow-tags to be set by config push.followTags

30 - + cmd_push: pass "flags" pointer to config callback

31 - + cmd_push: set "atomic" bit directly

32 - + git_push_config: drop cargo-culted wt_status pointer

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

40

34 - Restructure "git push" codepath to make it easier to add new

35 - configuration bits and then add push.followTags configuration that

36 - turns --follow-tags option on by default.

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

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

43

44

39 -* jk/smart-http-hide-refs (2015-03-12) 2 commits

40 - (merged to 'next' on 2015-03-16 at 530df4c)

41 - + upload-pack: do not check NULL return of lookup_unknown_object

42 - + upload-pack: fix transfer.hiderefs over smart-http

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

48

44 - The transfer.hiderefs support did not quite work for smart-http

45 - transport.

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

48 -* jk/tag-h-column-is-a-listing-option (2015-03-12) 1 commit

49 - (merged to 'next' on 2015-03-16 at 42b04c6)

50 - + tag: fix some mis-organized options in "-h" listing

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

52 - "git tag -h" used to show the "--column" and "--sort" options

53 - that are about listing in a wrong section.

59 + Code clean-up.

60

61

56 -* jk/test-annoyances (2015-03-12) 5 commits

57 - (merged to 'next' on 2015-03-16 at 845b091)

58 - + t5551: make EXPENSIVE test cheaper

59 - + t5541: move run_with_cmdline_limit to test-lib.sh

60 - + t: pass GIT_TRACE through Apache

61 - + t: redirect stderr GIT_TRACE to descriptor 4

62 - + t: translate SIGINT to an exit

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

64 - Test fixes.

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

67 + patches to this project.

68

69

67 -* js/completion-ctags-pattern-substitution-fix (2015-03-14) 1 commit

68 - (merged to 'next' on 2015-03-17 at 4a68861)

69 - + contrib/completion: escape the forward slash in __git_match_ctag

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

71 - The code that reads from the ctags file in the completion script

72 - (in contrib/) did not spell ${param/pattern/string} substitution

73 - correctly, which happened to work with bash but not with zsh.

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

76 -* nd/config-doc-camelCase (2015-03-13) 1 commit

77 - (merged to 'next' on 2015-03-16 at 0e3fedb)

78 - + *config.txt: stick to camelCase naming convention

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

80 - Documentation updates.

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

82 ---------------------------------------------------

83 -[New Topics]

90

85 -* jc/diff-no-index-d-f (2015-03-22) 1 commit

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

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

98

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

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

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

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.

102

103

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

@@ -108,7 +119,81 @@ of the repositories listed at

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

120 helper.

121

111 - Will merge to 'master'.

122 +

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

126 +

127 + Code simplification.

128 +

129 +

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

@@ -119,42 +204,74 @@ of the repositories listed at

204 codepath to protect us against a broken reimplementation of Git

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

206

122 - Will merge to 'master'.

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

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

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

212 + A test fix.

213

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

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

214

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

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

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

134 - produce and use them instead for offline consumption.

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.

221

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

138 - - diff-lib.c: adjust position of i-t-a entries in diff

222 +--------------------------------------------------

223 +[New Topics]

224

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

232

141 -* sb/leaks (2015-03-23) 9 commits

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

143 - + read-cache: fix memleak

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

145 - + commit.c: fix a memory leak

146 - + http-push: remove unneeded cleanup

147 - + merge-recursive: fix memleaks

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

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

150 - + update-index: fix a memleak

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

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

234 + XDG configuration file locations when specified.

235 +

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.

238 +

239 + Will cook in 'next'.

240

153 - Will merge to 'master'.

241 +

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

245 +

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.

249 +

250 +

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

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

253 +

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

255 +

256 +

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

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

259 +

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

261

262 --------------------------------------------------

263 [Stalled]

264

265 +* as/userdiff-sh (2015-03-13) 1 commit

266 + - userdiff: funcname and word patterns for sh

267 +

268 + Add a built-in "userdiff" patterns to word-split and identify

269 + notable lines in shell scripts to help presentation of diff and

270 + grep output.

271 +

272 + Will discard.

273 +

274 +

275 * mh/fdopen-with-retry (2015-03-06) 6 commits

276 - buffer_fdinit(): use fdopen_with_retry()

277 - update_info_file(): use fdopen_with_retry()

@@ -209,7 +326,7 @@ of the repositories listed at

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

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

328

212 - No comments? No interests?

329 + Will discard.

330

331

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

@@ -279,20 +396,23 @@ of the repositories listed at

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

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

398

282 - Waiting for a reroll.

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

295 - Reviews sent; waiting for a response.

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

@@ -302,7 +422,8 @@ of the repositories listed at

422 (i.e. the previous one).

423

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

305 - Expecting a reroll.

425 + Tired of waiting for a reroll.

426 + Will discard.

427

428

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

@@ -316,7 +437,8 @@ of the repositories listed at

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

438 like post-merge, I think.

439

319 - Waiting for a reroll.

440 + Tired of waiting for a reroll.

441 + Will discard.

442

443

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

@@ -325,6 +447,7 @@ of the repositories listed at

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

448

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

450 + Will discard.

451

452

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

@@ -349,51 +472,64 @@ of the repositories listed at

472 --------------------------------------------------

473 [Cooking]

474

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

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

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

355 - + clone: initialize atexit cleanup handler earlier

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"

478

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

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

359 - and files left without getting cleaned up.

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.

482

361 - Will merge to 'master'.

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

484

485

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

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

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

367 - + fetch_refs_via_pack: free extra copy of refs

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

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

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

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

488

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

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

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

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

491

374 - Will merge to 'master'.

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.

496

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

498 + possibility.

499

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

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

379 - + refs.c: drop curate_packed_refs

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

381 - + prune: turn on ref_paranoia flag

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

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

500

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

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

387 - damage and make it a larger one.

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

502 + (merged to 'next' on 2015-03-24 at a6be89f)

503 + + diff-lib.c: adjust position of i-t-a entries in diff

504

389 - Will merge to 'master'.

505 + After "git add -N", the path appeared in output of "git diff HEAD"

506 + and "git diff --cached HEAD", leading "git status" to classify it

507 + as "Changes to be committed". Such a path, however, is not yet to

508 + be scheduled to be committed. "git diff" showed the change to the

509 + path as modification, not as a "new file", in the header of its

510 + output.

511

512 + Treat such paths as "yet to be added to the index but Git already

513 + know about them"; "git diff HEAD" and "git diff --cached HEAD"

514 + should not talk about them, and "git diff" should show them as new

515 + files yet to be added to the index.

516

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

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

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

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

518

396 - Code simplification.

519 +

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

@@ -418,6 +554,8 @@ of the repositories listed at

554 worse, atoi()). Introduce a set of wrappers that try to be more

555 careful.

556

557 + Waiting for a reroll ($gmane/266209).

558 +

559

560 * tf/gitweb-project-listing (2015-03-19) 5 commits

561 - gitweb: make category headings into links when they are directories

@@ -432,79 +570,6 @@ of the repositories listed at

570 Any comments from those who use or have their own code in Gitweb?

571

572

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

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

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

438 -

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

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

441 -

442 - Will merge to 'master'.

443 -

444 -

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

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

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

448 -

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

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

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

452 - so it is also forbidden for now.

453 -

454 - Will merge to 'master'.

455 -

456 -

457 -* jk/test-chain-lint (2015-03-22) 28 commits

458 - - t6039: fix broken && chain

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

460 - - t9104: fix test for following larger parents

461 - - t4104: drop hand-rolled error reporting

462 - - t0005: fix broken &&-chains

463 - - t7004: fix embedded single-quotes

464 - - t0050: appease --chain-lint

465 - - t9001: use test_when_finished

466 - - t4117: use modern test_* helpers

467 - - t6034: use modern test_* helpers

468 - - t1301: use modern test_* helpers

469 - - t0020: use modern test_* helpers

470 - - t6030: use modern test_* helpers

471 - - t9502: fix &&-chain breakage

472 - - t7201: fix &&-chain breakage

473 - - t3600: fix &&-chain breakage for setup commands

474 - - t: avoid using ":" for comments

475 - - t: wrap complicated expect_code users in a block

476 - - t: use test_expect_code instead of hand-rolled comparison

477 - - t: use test_might_fail for diff and grep

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

479 - - t: use test_must_fail instead of hand-rolled blocks

480 - - t: use verbose instead of hand-rolled errors

481 - - t: assume test_cmp produces verbose output

482 - - t: fix trivial &&-chain breakage

483 - - t: fix moderate &&-chain breakage

484 - - t: fix severe &&-chain breakage

485 - - t/test-lib: introduce --chain-lint option

486 -

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

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

489 - unnoticed. The new GIT_TEST_CHAIN_LINT mechanism allows you to

490 - catch such a mistake more easily.

491 -

492 - What I queued here has fix to the issue J6t found in 15/25 squashed

493 - in, and also has 26/25 and 27/25 follow-up fixes from Michael, plus

494 - 28/25 follow-up from Torsten. If everybody involved is happy with

495 - it, we can just proceed with this copy, otherwise I'll let Peff

496 - reroll. I am happy either way.

497 -

498 -

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

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

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

502 -

503 - A test fix.

504 -

505 - Will merge to 'master'.

506 -

507 -

573 * jc/a-lone-dash-stands-for-previous-branch (2015-03-16) 1 commit

574 - "-" and "@{-1}" on various programs

575

@@ -518,66 +583,27 @@ of the repositories listed at

583 series goes anywhere.

584

585

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

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

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

524 -

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

526 - patches to this project.

527 -

528 - Will merge to 'master'.

529 -

530 -

531 -* as/userdiff-sh (2015-03-13) 1 commit

532 - - userdiff: funcname and word patterns for sh

533 -

534 - Add a built-in "userdiff" patterns to word-split and identify

535 - notable lines in shell scripts to help presentation of diff and

536 - grep output.

537 -

538 - Comments???

539 -

540 -

586 * bc/object-id (2015-03-13) 10 commits

542 - - apply: convert threeway_stage to object_id

543 - - patch-id: convert to use struct object_id

544 - - commit: convert parts to struct object_id

545 - - diff: convert struct combine_diff_path to object_id

546 - - bulk-checkin.c: convert to use struct object_id

547 - - zip: use GIT_SHA1_HEXSZ for trailers

548 - - archive.c: convert to use struct object_id

549 - - bisect.c: convert leaf functions to use struct object_id

550 - - define utility functions for object IDs

551 - - define a structure for object IDs

587 + (merged to 'next' on 2015-03-24 at 3ec4f83)

588 + + apply: convert threeway_stage to object_id

589 + + patch-id: convert to use struct object_id

590 + + commit: convert parts to struct object_id

591 + + diff: convert struct combine_diff_path to object_id

592 + + bulk-checkin.c: convert to use struct object_id

593 + + zip: use GIT_SHA1_HEXSZ for trailers

594 + + archive.c: convert to use struct object_id

595 + + bisect.c: convert leaf functions to use struct object_id

596 + + define utility functions for object IDs

597 + + define a structure for object IDs

598

599 Identify parts of the code that knows that we use SHA-1 hash to

600 name our objects too much, and use (1) symbolic constants instead

601 of hardcoded 20 as byte count and/or (2) use struct object_id

602 instead of unsigned char [20] for object names.

603

558 - Will merge to and cook in 'next'.

559 -

560 -

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

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

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

564 -

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

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

567 -

568 - Will merge to 'master'.

569 -

570 -

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

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

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

574 -

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

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

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

578 - discrete points. Forbid the combination.

579 -

580 - Will merge to 'master'.

604 + Will cook in 'next'.

605 + Also waiting for reviews on the follow-up series ($gmane/265939)

606 + that seems to have seen no interest X-<.

607

608

609 * nd/slim-index-pack-memory-usage (2015-02-27) 2 commits

@@ -587,7 +613,7 @@ of the repositories listed at

613 Memory usage of "git index-pack" has been trimmed by tens of

614 per-cent.

615

590 - Waiting for further comments.

616 + Waiting for further comments and a final reroll ($gmane/264544).

617

618

619 * nd/list-files (2015-02-09) 21 commits

@@ -617,8 +643,9 @@ of the repositories listed at

643 whistles.

644

645 Reroll to base on wt-status work ($gmane/265142) has seen some

620 - positive discussions. Waiting for a further polished reroll

621 - ($gmane/265534).

646 + positive discussions.

647 +

648 + Waiting for a further polished reroll ($gmane/265534).

649

650

651 * js/fsck-opt (2015-01-21) 19 commits

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

675 Expecting a reroll.

676

677

651 -* nd/multiple-work-trees (2015-03-20) 39 commits

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

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

680 + + t1501: fix test with split index

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

682 + t2026: fix broken &&-chain

683 (merged to 'next' on 2015-02-18 at b51f696)

What's cooking (2015/03 #09)