9c67e8da79 · matheusbsbs/matheus-bagliano

@@ -1,28 +1,17 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jun 2012, #04; Fri, 15)

3 -X-master-at: 7dba3f73e9571963fa03549956879d15ca7ad2d3

4 -X-next-at: b465d9982e61447cc6f1c0b16b99b6f38e7c0a47

2 +Subject: What's cooking in git.git (Jun 2012, #05; Tue, 19)

3 +X-master-at: d28436736a078a429213003a9472e8caeb86c286

4 +X-next-at: 4a7aa997f0006fbd039bce2d9fedafc4a70322d7

5

6 -What's cooking in git.git (Jun 2012, #04; Fri, 15)

6 +What's cooking in git.git (Jun 2012, #05; Tue, 19)

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 -A few more regression fixes have been made on the 'master' front

13 -since 1.7.11-rc3.

14 -

15 - - Recent "git diff" change started counting changes to binary files

16 - in bytes and adding it to shortstat output; fixed by Alexander

17 - Strasser.

18 -

19 - - Perl libraries needed for git-svn weren't correctly installed

20 - when MakeMaker was not in use; fixed by Jonathan Nieder.

21 -

22 - - Some gitweb tests failed when neither HTTP::Date or

23 - Time::ParseDate was available; fixed by Ramsay Jones.

24 -

25 -The final is still expected to happen this weekend.

12 +Now 1.7.11 is out, I'll start merging topics that have been cooking

13 +in 'next' to 'master', but let's wait for a few days in case some

14 +brown paper bag bugfixes are needed.

15

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

17 repositories listed at

@@ -32,25 +21,107 @@ repositories listed at

21 --------------------------------------------------

22 [New Topics]

23

35 -* lm/git-blame-el (2012-06-14) 3 commits

36 - - git-blame.el: Do not use bare 0 to mean (point-min)

37 - - git-blame.el: Use with-current-buffer where appropriate

38 - - git-blame.el: Do not use goto-line in lisp code

24 +* cn/cherry-pick-range-docs (2012-06-15) 2 commits

25 + - git-cherry-pick.txt: clarify the use of revision range notation

26 + - Documentation: --no-walk is no-op if range is specified

27

40 -Will merge to next after 1.7.11.

28 +Will merge to 'next' and soon to 'master'.

29

42 -* lp/no-cmd-http-fetch (2012-06-15) 1 commit

43 - - builtin.h: remove unused cmd_<foo> declarations

30 +* jc/sha1-name-more (2012-06-18) 9 commits

31 + - sha1_name.c: get_describe_name() by definition groks only commits

32 + - sha1_name.c: teach get_short_sha1() a commit-only option

33 + - sha1_name.c: allow get_short_sha1() to take other flags

34 + - sha1_name.c: teach find_short_packed_object() a commit-only option

35 + - sha1_name.c: teach find_short_object_filename() a commit-only option

36 + - sha1_name.c: refactor find_short_packed_object()

37 + - sha1_name.c: rename "now" to "current"

38 + - sha1_name.c: clarify what "fake" is for in find_short_object_filename()

39 + - sha1_name.c: indentation fix

40

45 -Will merge to next after 1.7.11.

41 +Teaches the object name parser that a "git describe" output is

42 +always a commit object, to prolong the lifetime of abbreviated

43 +object name in it.

44

47 -* jk/diff-no-index-pager (2012-06-15) 2 commits

48 - - do not run pager with diff --no-index --quiet

49 - - fix pager.diff with diff --no-index

45 +* jk/version-string-dependency (2012-06-19) 3 commits

46 + - Makefile: split prefix flags from GIT-CFLAGS

47 + - Makefile: split GIT_USER_AGENT from GIT-CFLAGS

48 + - Makefile: apply dependencies consistently to sparse/asm targets

49 + (this branch uses jk/version-string.)

50 +

51 +* jn/perl-makemaker-leading-paths (2012-06-15) 1 commit

52 + - perl/Makefile: move "mkdir -p" to module installation loop for maintainability

53 +

54 +Will wait for a few days to see if somebody comes up with a more

55 +concise and cleaner way to do this, but otherwise this looked good.

56 +

57 +* mm/verify-filename-fix (2012-06-18) 2 commits

58 + - verify_filename(): ask the caller to chose the kind of diagnosis

59 + - sha1_name: do not trigger detailed diagnosis for file arguments

60 +

61 +"git diff COPYING HEAD:COPYING" gave a nonsense error message that

62 +claimed that the treeish HEAD did not have COPYING in it.

63 +

64 +Will merge to 'next' and soon to 'master'.

65 +

66 +* tr/maint-show-walk (2012-06-19) 2 commits

67 + - show: fix "range implies walking"

68 + - Demonstrate git-show is broken with ranges

69 +

70 +Fixes "git show"'s auto-walking behaviour, and make it behave just

71 +like "git log" does when it walks.

72 +

73 +Note that this is different from Thomas's patch.

74

75 --------------------------------------------------

76 [Stalled]

77

78 +* db/vcs-svn (2012-06-01) 6 commits

79 + - vcs-svn: drop no-op reset methods

80 + - vcs-svn: fix signedness warnings

81 + - vcs-svn: prefer strstr over memmem

82 + - vcs-svn: prefer constcmp to prefixcmp

83 + - vcs-svn: simplify cleanup in apply_one_window()

84 + - vcs-svn: fix clang-analyzer error

85 +

86 +Waiting for Jonathan's clean-up offered earlier.

87 +

88 +* vr/use-our-perl-in-tests (2012-06-12) 3 commits

89 + - t/README: add a bit more Don'ts

90 + - tests: enclose $PERL_PATH in duoble quotes

91 + - t: Replace 'perl' by $PERL_PATH

92 +

93 +Needs more work.

94 +

95 +There are still unconverted use of bare 'perl' remaining in the test

96 +scripts, the second patch needs its title typofixed, and PERL_PATH

97 +needs to be exported to the environment from test-lib.sh.

98 +

99 +* jc/apply-3way (2012-06-13) 19 commits

100 + - apply --3way: tests

101 + - apply: document --3way option

102 + - apply: allow rerere() upon --3way results

103 + - apply: register conflicted stages to the index

104 + - apply: --3way with add/add conflict

105 + - apply: move verify_index_match() higher

106 + - apply: plug the three-way merge logic in

107 + - apply: fall back on three-way merge

108 + - apply: accept -3/--3way command line option

109 + - apply: move "already exists" logic to check_to_create()

110 + - apply: move check_to_create_blob() closer to its sole caller

111 + - apply: further split load_preimage()

112 + - apply: refactor "previous patch" logic

113 + - apply: split load_preimage() helper function out

114 + - apply: factor out checkout_target() helper function

115 + - apply: refactor read_file_or_gitlink()

116 + - apply: clear_image() clears things a bit more

117 + - apply: a bit more comments on PATH_TO_BE_DELETED

118 + - apply: fix an incomplete comment in check_patch()

119 +

120 +"git apply" learns to wiggle the base version and perform three-way merge

121 +when a patch does not exactly apply to the version you have.

122 +

123 +Waiting for comments.

124 +

125 * nl/http-proxy-more (2012-05-11) 2 commits

126 - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

127 - http: Avoid limit of retrying request only twice

@@ -59,6 +130,8 @@ I queued only the later two patches from this series, even though they do

130 not make much sense without the first one that seems to need a bit more

131 work, so that we won't forget.

132

133 +Will discard without prejudice, unless rerolled.

134 +

135 * jk/no-op-push-message (2012-05-30) 1 commit

136 - improve no-op push output

137

@@ -69,30 +142,20 @@ people who get the message when their current branch is not pushed.

142 I had an impression after the discussion thread that a redesign is

143 coming, but it hasn't happened yet.

144

72 -* fc/git-prompt-script (2012-06-10) 6 commits

73 - - completion: warn people about duplicated function

74 - - completion: split __git_ps1 into a separate script

75 - - completion: remove executable mode

76 - - Merge branch 'fc/git-complete-helper' into fc/git-prompt-script

77 - - tests: add tests for the bash prompt functions in the completion script

78 - - tests: move code to run tests under bash into a helper library

79 - (this branch is tangled with sg/bash-prompt.)

80 -

81 -The last remaining sticking point is what to do with the duplicated

82 -shell function. Together with the warning patch at the tip, if we

83 -side port the tip commit from sg/bash-prompt, I think this will be

84 -ready for testing.

145 +Will discard without prejudice, unless rerolled.

146

147 * sg/bash-prompt (2012-05-09) 4 commits

87 - - completion: respect $GIT_DIR

88 - - completion: use __gitdir() in _git_log()

148 + . completion: respect $GIT_DIR

149 + . completion: use __gitdir() in _git_log()

150 - tests: add tests for the bash prompt functions in the completion script

151 - tests: move code to run tests under bash into a helper library

152 (this branch is tangled with fc/git-prompt-script.)

153

93 -This is only the "correction" bits taken from the beginning of a larger

94 -series that is to be rerolled. The first two are tangled with Felipe's

95 -topic so a reroll, if comes, should build on top of them.

154 +This is only the "correction" bits taken from the beginning of a

155 +larger series that is to be rerolled. The tip commit has been

156 +cherry-picked to fc/fc/git-prompt-script topic.

157 +

158 +Will discard without prejudice.

159

160 * jc/maint-push-refs-all (2012-05-04) 2 commits

161 - get_fetch_map(): tighten checks on dest refs

@@ -104,13 +167,13 @@ There still seem to be other bugs hiding (e.g. try pushing twice).

167 Not ready.

168

169 * jc/run-hook-env-1 (2012-03-11) 1 commit

107 - - run_hook(): enhance the interface to pass arbitrary environment

108 -

109 -Not urgent.

170 + . run_hook(): enhance the interface to pass arbitrary environment

171

172 Updates run_hook() API to be much less specific to "commit". It would

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

174

175 +Will discard.

176 +

177 * jc/split-blob (2012-04-03) 6 commits

178 - chunked-object: streaming checkout

179 - chunked-object: fallback checkout codepaths

@@ -144,13 +207,47 @@ not working :-(.

207 --------------------------------------------------

208 [Cooking]

209

210 +* fc/git-prompt-script (2012-06-19) 7 commits

211 + - completion: respect $GIT_DIR

212 + - completion: warn people about duplicated function

213 + - completion: split __git_ps1 into a separate script

214 + - completion: remove executable mode

215 + - Merge branch 'fc/git-complete-helper' into fc/git-prompt-script

216 + - tests: add tests for the bash prompt functions in the completion script

217 + - tests: move code to run tests under bash into a helper library

218 + (this branch is tangled with sg/bash-prompt.)

219 +

220 +Splits a rather heavy-ish "git completion" script out and creates a

221 +separate "git prompting" script, to help lazy-autoloading of the

222 +completion part while making prompting part always available.

223 +

224 +Will merge to 'next'.

225 +

226 +* lm/git-blame-el (2012-06-14) 3 commits

227 + - git-blame.el: Do not use bare 0 to mean (point-min)

228 + - git-blame.el: Use with-current-buffer where appropriate

229 + - git-blame.el: Do not use goto-line in lisp code

230 +

231 +Will merge to 'next' and soon to 'master'.

232 +

233 +* lp/no-cmd-http-fetch (2012-06-15) 1 commit

234 + - builtin.h: remove unused cmd_<foo> declarations

235 +

236 +Will merge to 'next' and soon to 'master'.

237 +

238 +* jk/diff-no-index-pager (2012-06-15) 2 commits

239 + - do not run pager with diff --no-index --quiet

240 + - fix pager.diff with diff --no-index

241 +

242 +Will merge to 'next' and soon to 'master'.

243 +

244 * nd/i18n-branch-lego (2012-06-07) 1 commit

245 - Remove i18n legos in notifying new branch tracking setup

246

247 Restructure the way message strings are created, in preparation for

248 marking them for i18n.

249

153 -Will merge to next after 1.7.11.

250 +Will merge to 'next' and soon to 'master'.

251

252 * nd/i18n-misc (2012-06-07) 3 commits

253 - rerere: remove i18n legos in result message

@@ -160,22 +257,22 @@ Will merge to next after 1.7.11.

257 Restructure the way message strings are created, in preparation for

258 marking them for i18n.

259

163 -Will merge to next after 1.7.11.

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

261

262 * rr/doc-commit (2012-06-08) 1 commit

263 - commit: document a couple of options

264

168 -Will merge to next after 1.7.11.

265 +Will merge to 'next' and soon to 'master'.

266

170 -* hv/remote-end-hung-up (2012-06-11) 1 commit

171 - - lessen the impression of unexpectedness on remote hangup

267 +* hv/remote-end-hung-up (2012-06-19) 1 commit

268 + - remove the impression of unexpectedness when access is denied

269

173 -Still being discussed.

270 +Will merge to 'next'.

271

272 * hv/submodule-checkout-nuke-submodules (2012-06-11) 1 commit

273 - update-index: allow overwriting existing submodule index entries

274

178 -Will merge to next after 1.7.11.

275 +Will merge to 'next'.

276

277 * jc/rev-list-simplify-merges-first-parent (2012-06-13) 3 commits

278 - revision: ignore side parents while running simplify-merges

@@ -187,50 +284,17 @@ I need to send this out to the list for re-review.

284 * jc/ustar-checksum-is-unsigned (2012-06-13) 1 commit

285 - archive: ustar header checksum is computed unsigned

286

190 -Will merge to next after 1.7.11.

287 +Will merge to 'next' and soon to 'master'.

288

289 * rs/git-blame-mapcar-mapc (2012-06-10) 1 commit

290 - git-blame.el: use mapc instead of mapcar

291

195 -Will merge to next after 1.7.11.

292 +Will merge to 'next' and soon to 'master'.

293

294 * rs/ipv6-ssh-url (2012-06-13) 1 commit

295 - git: Wrong parsing of ssh urls with IPv6 literals ignores port

296

200 -Will merge to next after 1.7.11.

201 -

202 -* vr/use-our-perl-in-tests (2012-06-12) 3 commits

203 - - t/README: add a bit more Don'ts

204 - - tests: enclose $PERL_PATH in duoble quotes

205 - - t: Replace 'perl' by $PERL_PATH

206 -

207 -Will merge to next after 1.7.11.

208 -

209 -* jc/apply-3way (2012-06-13) 19 commits

210 - - apply --3way: tests

211 - - apply: document --3way option

212 - - apply: allow rerere() upon --3way results

213 - - apply: register conflicted stages to the index

214 - - apply: --3way with add/add conflict

215 - - apply: move verify_index_match() higher

216 - - apply: plug the three-way merge logic in

217 - - apply: fall back on three-way merge

218 - - apply: accept -3/--3way command line option

219 - - apply: move "already exists" logic to check_to_create()

220 - - apply: move check_to_create_blob() closer to its sole caller

221 - - apply: further split load_preimage()

222 - - apply: refactor "previous patch" logic

223 - - apply: split load_preimage() helper function out

224 - - apply: factor out checkout_target() helper function

225 - - apply: refactor read_file_or_gitlink()

226 - - apply: clear_image() clears things a bit more

227 - - apply: a bit more comments on PATH_TO_BE_DELETED

228 - - apply: fix an incomplete comment in check_patch()

229 -

230 -"git apply" learns to wiggle the base version and perform three-way merge

231 -when a patch does not exactly apply to the version you have.

232 -

233 -Waiting for comments.

297 +Will merge to 'next' and soon to 'master'.

298

299 * nd/exclude-workaround-top-heavy (2012-06-07) 3 commits

300 - exclude: do strcmp as much as possible before fnmatch

@@ -241,14 +305,18 @@ Attempts to optimize matching with an exclude pattern with a deep

305 directory hierarchy by taking the part that specifies leading path

306 without wildcard literally.

307

308 +Will merge to 'next'.

309 +

310 * jc/bundle-complete-notice (2012-06-04) 1 commit

245 - (merged to 'next' on 2012-06-05 at ee25a35)

311 + (merged to 'next' on 2012-06-19 at b42227b)

312 + tweak "bundle verify" of a complete history

313

314 +Originally merged to 'next' on 2012-06-04.

315 +

316 Running "git bundle verify" on a bundle that records a complete

317 history said "it requires these 0 commits".

318

251 -Not urgent; probably early post 1.7.11.

319 +Will merge to 'master'.

320

321 * lk/more-helpful-status-hints (2012-06-14) 4 commits

322 - status: better advices when splitting a commit (during rebase -i)

@@ -256,7 +324,7 @@ Not urgent; probably early post 1.7.11.

324 - t7512-status-help.sh: better advices for git status

325 - wt-status.*: better advices for git status added

326

259 -Will merge to next after 1.7.11.

327 +Will merge to 'next'.

328

329 * jk/no-more-pre-exec-callback (2012-06-05) 1 commit

330 - pager: drop "wait for output to run less" hack

@@ -264,12 +332,14 @@ Will merge to next after 1.7.11.

332 On hold for 6 months until ancient "less" goes extinct.

333

334 * jk/maint-t1304-setfacl (2012-06-07) 1 commit

267 - (merged to 'next' on 2012-06-08 at ebba27c)

335 + (merged to 'next' on 2012-06-19 at 2449521)

336 + t1304: improve setfacl prerequisite setup

337

338 +Originally merged to 'next' on 2012-06-08.

339 +

340 Works around a false test failure caused by a bug in ecryptofs.

341

272 -Not urgent; probably early post 1.7.11.

342 +Will merge to 'master'.

343

344 * lk/rebase-i-x (2012-06-13) 1 commit

345 - rebase -i: teach "--exec <cmd>"

@@ -277,83 +347,93 @@ Not urgent; probably early post 1.7.11.

347 Adds -x <cmd> to "rebase -i" to insert "exec <cmd>" after each

348 commit in the resulting history.

349

280 -Will merge to next after 1.7.11.

350 +Will merge to 'next'.

351

352 * vr/help-per-platform (2012-06-06) 1 commit

283 - (merged to 'next' on 2012-06-08 at f4b2b0b)

353 + (merged to 'next' on 2012-06-19 at d9a08ba)

354 + help: use HTML as the default help format on Windows

355

286 -Not urgent; probably early post 1.7.11.

356 +Originally merged to 'next' on 2012-06-08

357 +

358 +We used to always default to "man" format even on platforms where

359 +"man" viewer is not widely available.

360 +

361 +Will merge to 'master'.

362

363 * jc/ls-files-i-dir (2012-06-05) 6 commits

289 - (merged to 'next' on 2012-06-08 at 2b5a256)

364 + (merged to 'next' on 2012-06-19 at 4a7aa99)

365 + dir.c: make excluded() file scope static

366 + unpack-trees.c: use path_excluded() in check_ok_to_remove()

367 + builtin/add.c: use path_excluded()

368 + path_excluded(): update API to less cache-entry centric

294 - (merged to 'next' on 2012-06-05 at 8f35db3)

369 + ls-files -i: micro-optimize path_excluded()

370 + ls-files -i: pay attention to exclusion of leading paths

371

372 +Originally merged to 'next' on 2012-06-08.

373 +

374 "git ls-files --exclude=t -i" did not consider anything under t/

375 as excluded, as it did not pay attention to exclusion of leading

376 paths while walking the index. Other two users of excluded() are

377 also updated.

378

303 -Not urgent; probably early post 1.7.11.

379 +Will merge to 'master'.

380

381 * jc/request-pull-match-tagname (2012-06-01) 1 commit

306 - (merged to 'next' on 2012-06-05 at f0dc420)

382 + (merged to 'next' on 2012-06-19 at bb96d6c)

383 + request-pull: really favor a matching tag

384

385 +Originally merged to 'next' on 2012-06-05.

386 +

387 "git request-pull $url dev" when the tip of "dev" branch was tagged

388 with "ext4-for-linus" used the contents from the tag in the output

389 but still asked the "dev" branch to be pulled, not the tag.

390

313 -Not urgent; probably early post 1.7.11.

314 -

315 -* db/vcs-svn (2012-06-01) 6 commits

316 - - vcs-svn: drop no-op reset methods

317 - - vcs-svn: fix signedness warnings

318 - - vcs-svn: prefer strstr over memmem

319 - - vcs-svn: prefer constcmp to prefixcmp

320 - - vcs-svn: simplify cleanup in apply_one_window()

321 - - vcs-svn: fix clang-analyzer error

322 -

323 -I'd take Jonathan's clean-up offer and keep this on hold until

324 -1.7.11 final.

391 +Will merge to 'master'.

392

393 * jk/version-string (2012-06-03) 3 commits

327 - (merged to 'next' on 2012-06-05 at b6f7266)

394 + (merged to 'next' on 2012-06-19 at 12f8e07)

395 + http: get default user-agent from git_user_agent

396 + version: add git_user_agent function

397 + move git_version_string into version.c

398 + (this branch is used by jk/version-string-dependency.)

399 +

400 +Originally merged to 'next' on 2012-06-05.

401

332 -Will merge to master early post 1.7.11.

402 +Teaches git native protocol agents to show software version over the

403 +wire.

404 +

405 +Will merge to 'master'.

406

407 * nd/stream-pack-objects (2012-05-29) 1 commit

408 - pack-objects: use streaming interface for reading large loose blobs

409

337 -Will merge to next after 1.7.11.

410 +Will merge to 'next'.

411

412 * jk/clone-local (2012-05-30) 2 commits

340 - (merged to 'next' on 2012-06-05 at b819eb5)

413 + (merged to 'next' on 2012-06-19 at a42bbcc)

414 + clone: allow --no-local to turn off local optimizations

415 + docs/clone: mention that --local may be ignored

416

417 +Originally merged to 'next' on 2012-06-05.

418 +

419 "git clone --local $path" started its life as an experiment to

420 optionally use link/copy when cloning a repository on the disk, but

421 we didn't deprecate it after we made the option a no-op to always

422 use the optimization.

423

349 -Not urgent; probably early post 1.7.11.

424 +Will merge to 'master'.

425

426 * jk/no-more-asciidoc7 (2012-05-30) 2 commits

352 - (merged to 'next' on 2012-06-05 at 3f117df)

427 + (merged to 'next' on 2012-06-19 at a36b498)

428 + docs: drop antique comment from Makefile

429 + docs: drop asciidoc7compatible flag

430

356 -Not urgent; probably early post 1.7.11.

431 +Originally merged to 'next' on 2012-06-05.

432 +

433 +We no longer use AsciiDoc7 syntax in our documentation and favor a

434 +more modern style.

435 +

436 +Will merge to 'master'.

437

438 * nd/stream-index-pack (2012-05-24) 4 commits

439 - index-pack: use streaming interface for collision test on large blobs

@@ -364,7 +444,7 @@ Not urgent; probably early post 1.7.11.

444 Use streaming API to read from the object store to avoid having to hold

445 a large blob object in-core while running index-pack.

446

367 -Will merge to next after 1.7.11.

447 +Will merge to 'next'.

448

449 * js/submodule-relative (2012-06-14) 5 commits

450 - t7400: avoid path mangling issues

@@ -377,12 +457,12 @@ Makes "git submodule" deal with nested submodule structure where a

457 module is contained within a module whose origin is specified as a

458 relative URL to its superproject's origin.

459

380 -Not urgent; probably early post 1.7.11.

460 +Will merge to 'next'.

461

462 * mm/push-default-switch-warning (2012-06-06) 1 commit

463 - push: start warning upcoming default change for push.default

464

385 -Will merge to next after 1.7.11.

465 +Will merge to 'next'.

466

467 Hopwefully we can have a solidly tested series early in 1.7.12 or

468 1.7.13 at the latest.

What's cooking (2012/06 #05)