8ea53dfe59 · matheusbsbs/matheus-bagliano

@@ -1,17 +1,18 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jun 2012, #02; Wed, 6)

3 -X-master-at: f623ca1cae600e97cb0b38131fdd33e4fb669cf8

4 -X-next-at: 8e148144574e6c6511b591286e44a677a260d760

2 +Subject: What's cooking in git.git (Jun 2012, #03; Wed, 13)

3 +X-master-at: 2ae48a9bb87193de9e9da10abd9e7286c0e4c43d

4 +X-next-at: 8698a94dadcf25a536d802359376c8811d29a59d

5

6 -What's cooking in git.git (Jun 2012, #02; Wed, 6)

6 +What's cooking in git.git (Jun 2012, #03; Wed, 13)

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 -I'm planning to tag 1.7.11-rc2 tomorrow or Friday (we have slipped

13 -by one week). Please concentrate on testing, finding and fixing

14 -regressions introduced after 1.7.10 until 1.7.11 final.

12 +Most likely, I'll tag 1.7.11 final this weekend. It doesn't look

13 +like there is any remaining topic that cannot wait for the next

14 +cycle. A few small regressions on the master front have been

15 +patched up, and it seems we are good to go.

16

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

18 repositories listed at

@@ -21,90 +22,84 @@ repositories listed at

22 --------------------------------------------------

23 [New Topics]

24

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

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

26 - + tweak "bundle verify" of a complete history

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

26 + - Remove i18n legos in notifying new branch tracking setup

27

28 -Running "git bundle verify" on a bundle that records a complete

29 -history said "it requires these 0 commits".

28 +Restructure the way message strings are created, in preparation for

29 +marking them for i18n.

30

31 -Not urgent; probably early post 1.7.11.

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

32 + - rerere: remove i18n legos in result message

33 + - notes-merge: remove i18n legos in merge result message

34 + - reflog: remove i18n legos in pruning message

35

33 -* jc/svn-auth-providers-unusable-at-1.6.12 (2012-06-04) 1 commit

34 - (merged to 'next' on 2012-06-04 at c4ffe24)

35 - + git-svn: platform auth providers are working only on 1.6.15 or newer

36 +Restructure the way message strings are created, in preparation for

37 +marking them for i18n.

38

37 -Regression fix for people with libsvn between 1.6.12 and 1.6.15 on

38 -which we tried to use non-working platform auth providers.

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

40 + - commit: document a couple of options

41

40 -Will merge to master.

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

43 + - lessen the impression of unexpectedness on remote hangup

44

42 -* lk/more-helpful-status-hints (2012-06-05) 4 commits

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

44 - - status: don't suggest "git rm" or "git add" if not appropriate

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

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

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

46 + - update-index: allow overwriting existing submodule index entries

47

48 -Almost there, modulo minor details pointed out by Matthieu.

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

49 + - revision: ignore side parents while running simplify-merges

50 + - revision: note the lack of free() in simplify_merges()

51 + - revision: "simplify" options imply topo-order sort

52

50 -* rr/maint-t3510-cascade-fix (2012-06-04) 1 commit

51 - (merged to 'next' on 2012-06-04 at 4c3368b)

52 - + t3510 (cherry-pick-sequence): add missing '&&'

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

54 + - archive: ustar header checksum is computed unsigned

55

54 -Will merge to master.

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

57 + - git-blame.el: use mapc instead of mapcar

58

56 -* jc/merge-annotated-tag (2012-06-05) 2 commits

57 - - merge: allow fast-forwarding to an annotated but unsigned tag

58 - - merge: separte the logic to check for a signed tag

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

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

61

60 -"git merge anno" created a merge commit even when anno is an

61 -unsigned annotated tag that points at a commit that can be fast

62 -forwarded to; this came from a laziness of the implementation of

63 -merging of signed tags in 1.7.9, and can be worked around by saying

64 -"git merge --ff-only anno", so it is not really necessariy, but is

65 -here for completeness.

66 -

67 -Not urgent.

68 -

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

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

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

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

64 + - tests: enclose $PERL_PATH in duoble quotes

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

66

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

73 -

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

75 - - t1304: improve setfacl prerequisite setup

67 +--------------------------------------------------

68 +[Graduated to "master"]

69

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

70 +* cr/persistent-https (2012-05-30) 1 commit

71 + (merged to 'next' on 2012-06-01 at c647464)

72 + + Add persistent-https to contrib

73

79 -Not urgent; probably early post 1.7.11.

74 +A remote helper that acts as a proxy that caches ssl session for the

75 +https:// transport is added to the contrib/ area.

76

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

82 - - rebase [-i --exec | -ix] <cmd>...

77 +* jc/fmt-merge-msg-people (2012-06-06) 1 commit

78 + (merged to 'next' on 2012-06-08 at 7d8f4b6)

79 + + fmt-merge-msg: make attribution into comment lines

80

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

85 -commit in the resulting history.

81 +* jc/svn-auth-providers-unusable-at-1.6.12 (2012-06-04) 1 commit

82 + (merged to 'next' on 2012-06-04 at c4ffe24)

83 + + git-svn: platform auth providers are working only on 1.6.15 or newer

84

87 -Not urgent; probably early post 1.7.11.

85 +Regression fix for people with libsvn between 1.6.12 and 1.6.15 on

86 +which we tried to use non-working platform auth providers.

87

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

90 - - help: use HTML as the default help format on Windows

88 +* mm/api-credentials-doc (2012-06-07) 5 commits

89 + + docs: fix cross-directory linkgit references

90 + (merged to 'next' on 2012-06-05 at 8e14814)

91 + + api-credentials.txt: add "see also" section

92 + + api-credentials.txt: mention credential.helper explicitly

93 + + api-credentials.txt: show the big picture first

94 + + doc: fix xref link from api docs to manual pages

95

92 -* jc/fmt-merge-msg-people (2012-06-06) 1 commit

93 - - fmt-merge-msg: make attribution into comment lines

96 +* rr/maint-t3510-cascade-fix (2012-06-04) 1 commit

97 + (merged to 'next' on 2012-06-04 at 4c3368b)

98 + + t3510 (cherry-pick-sequence): add missing '&&'

99

100 --------------------------------------------------

101 [Stalled]

102

98 -* nd/exclude-workaround-top-heavy (2012-05-29) 2 commits

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

100 - - Unindent excluded_from_list()

101 -

102 -Attempts to optimize matching with an exclude pattern with a deep

103 -directory hierarchy by taking the part that specifies leading path

104 -without wildcard literally.

105 -

106 -The code to check for wildcard needs to be redone.

107 -

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

104 - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

105 - http: Avoid limit of retrying request only twice

@@ -120,7 +115,11 @@ Rewords the status message of "git push" that pushed only one ref

115 differently from "Everything up-to-date", to give a bit more help to

116 people who get the message when their current branch is not pushed.

117

123 -* fc/git-prompt-script (2012-05-22) 5 commits

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

119 +coming, but it hasn't happened yet.

120 +

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

122 + - completion: warn people about duplicated function

123 - completion: split __git_ps1 into a separate script

124 - completion: remove executable mode

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

@@ -128,8 +127,10 @@ people who get the message when their current branch is not pushed.

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

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

129

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

132 -function.

130 +The last remaining sticking point is what to do with the duplicated

131 +shell function. Together with the warning patch at the tip, if we

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

133 +ready for testing.

134

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

136 - completion: respect $GIT_DIR

@@ -142,36 +143,15 @@ This is only the "correction" bits taken from the beginning of a larger

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

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

145

145 -* jc/apply-3way (2012-06-06) 12 commits

146 - - apply: fix an incomplete message

147 - - apply: refactor "previous patch" logic

148 - - apply: a bit more comments on PATH_TO_BE_DELETED

149 - - apply: document --3way option

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

151 - - apply: register conflicted stages to the index

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

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

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

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

156 - - apply: refactor read_file_or_gitlink()

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

158 -

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

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

161 -

162 -It turns out that it is somewhat unpleasant to handle add/add conflicts in

163 -this code, but it seems necessary if we want to use "apply -3" to replace

164 -the use of "apply --build-fake-ancestor" followed by the slow "merge" in

165 -"am -3".

166 -

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

147 - get_fetch_map(): tighten checks on dest refs

148 - fetch/push: allow refs/*:refs/*

149

150 Allows pushing and fetching refs/stash.

172 -Not ready.

151 There still seem to be other bugs hiding (e.g. try pushing twice).

152

153 +Not ready.

154 +

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

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

157

@@ -213,11 +193,91 @@ not working :-(.

193 --------------------------------------------------

194 [Cooking]

195

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

197 + - apply --3way: tests

198 + - apply: document --3way option

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

200 + - apply: register conflicted stages to the index

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

202 + - apply: move verify_index_match() higher

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

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

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

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

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

208 + - apply: further split load_preimage()

209 + - apply: refactor "previous patch" logic

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

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

212 + - apply: refactor read_file_or_gitlink()

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

214 + - apply: a bit more comments on PATH_TO_BE_DELETED

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

216 +

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

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

219 +

220 +

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

222 + - exclude: do strcmp as much as possible before fnmatch

223 + - dir.c: get rid of the wildcard symbol set in no_wildcard()

224 + - Unindent excluded_from_list()

225 +

226 +Attempts to optimize matching with an exclude pattern with a deep

227 +directory hierarchy by taking the part that specifies leading path

228 +without wildcard literally.

229 +

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

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

232 + + tweak "bundle verify" of a complete history

233 +

234 +Running "git bundle verify" on a bundle that records a complete

235 +history said "it requires these 0 commits".

236 +

237 +Not urgent; probably early post 1.7.11.

238 +

239 +* lk/more-helpful-status-hints (2012-06-11) 5 commits

240 + - fixup! status: better advices when splitting a commit (during rebase -i)

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

242 + - status: don't suggest "git rm" or "git add" if not appropriate

243 + - t7512-status-help.sh: better advices for git status

244 + - wt-status.*: better advices for git status added

245 +

246 +Almost there, modulo minor details pointed out by Matthieu.

247 +

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

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

250 +

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

252 +

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

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

255 + + t1304: improve setfacl prerequisite setup

256 +

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

258 +

259 +Not urgent; probably early post 1.7.11.

260 +

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

262 + - rebase -i: teach "--exec <cmd>"

263 +

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

265 +commit in the resulting history.

266 +

267 +Will merge to next after 1.7.11.

268 +

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

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

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

272 +

273 +Not urgent; probably early post 1.7.11.

274 +

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

217 - - dir.c: make excluded() file scope static

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

219 - - builtin/add.c: use path_excluded()

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

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

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

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

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

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

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

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

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

@@ -247,8 +307,8 @@ Not urgent; probably early post 1.7.11.

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

308 - vcs-svn: fix clang-analyzer error

309

250 -I do not know the doneness of this series that came out of the

251 -blue. Are people involved in vcs-svn happy with this series?

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

311 +1.7.11 final.

312

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

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

@@ -256,22 +316,12 @@ blue. Are people involved in vcs-svn happy with this series?

316 + version: add git_user_agent function

317 + move git_version_string into version.c

318

259 -I am somewhat tempted to merge this to master before 1.7.11 final.

260 -Thoughts?

261 -

262 -* mm/api-credentials-doc (2012-06-04) 4 commits

263 - (merged to 'next' on 2012-06-05 at 8e14814)

264 - + api-credentials.txt: add "see also" section

265 - + api-credentials.txt: mention credential.helper explicitly

266 - + api-credentials.txt: show the big picture first

267 - + doc: fix xref link from api docs to manual pages

268 -

269 -Will merge to master.

319 +Will merge to master early post 1.7.11.

320

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

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

323

274 -Not urgent; probably early post 1.7.11.

324 +Will merge to next after 1.7.11.

325

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

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

@@ -292,15 +342,6 @@ Not urgent; probably early post 1.7.11.

342

343 Not urgent; probably early post 1.7.11.

344

295 -* cr/persistent-https (2012-05-30) 1 commit

296 - (merged to 'next' on 2012-06-01 at c647464)

297 - + Add persistent-https to contrib

298 -

299 -A remote helper that acts as a proxy that caches ssl session for the

300 -https:// transport is added to the contrib/ area.

301 -

302 -Will merge to master.

303 -

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

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

347 - index-pack: factor out unpack core from get_data_from_pack

@@ -310,7 +351,7 @@ Will merge to master.

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

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

353

313 -Not urgent; probably early post 1.7.11.

354 +Will merge to next after 1.7.11.

355

356 * js/submodule-relative (2012-06-06) 4 commits

357 - submodule: fix handling of superproject origin URLs like foo, ./foo and ./foo/bar

@@ -342,3 +383,15 @@ Hopwefully we can have a solidly tested series early in 1.7.12 or

383 + git-daemon wrapper to wait until daemon is ready

384

385 Reverted from 'next' to replace it with js/daemon-test-race-fix.

386 +

387 +* jc/merge-annotated-tag (2012-06-05) 2 commits

388 + . merge: allow fast-forwarding to an annotated but unsigned tag

389 + . merge: separte the logic to check for a signed tag

390 +

391 +"git merge anno" created a merge commit even when anno is an

392 +unsigned annotated tag that points at a commit that can be fast

393 +forwarded to; this came from a laziness of the implementation of

394 +merging of signed tags in 1.7.9. People may have different opinion

395 +on making signed and unsigned annotated tag behave differently, but

396 +I tend to agree that it is probably not a good idea.

397 +

What's cooking (2012/06 #03)