d51465793e · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jun 2012, #01; Sun, 3)

3 -X-master-at: 3fe4498197ced84886b4adaddf18f1109b477f8e

4 -X-next-at: 281ad67c6ed0afb147ad426ff961c221b935af77

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

3 +X-master-at: f623ca1cae600e97cb0b38131fdd33e4fb669cf8

4 +X-next-at: 8e148144574e6c6511b591286e44a677a260d760

5

6 -What's cooking in git.git (Jun 2012, #01; Sun, 3)

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

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 -v1.7.11-rc1 has been tagged. Except for trivially obvious and small

13 -fixes to older bugs and trivially obvious and small patches to

14 -documentation, please consider we are in "regression fix only"

15 -mode. Finding and fixing since v1.7.10 is the top priority.

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.

15

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

17 repositories listed at

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

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

22 [New Topics]

23

25 -* jc/ls-files-i-dir (2012-06-03) 2 commits

26 - - ls-files -i: micro-optimize path_excluded()

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

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

27

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

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

31 -paths while walking the index.

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

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

30

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

34 - - request-pull: really favor a matching tag

31 +Not urgent; probably early post 1.7.11.

32

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

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

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

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

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

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

42 - - vcs-svn: fix signedness warnings

43 - - vcs-svn: prefer strstr over memmem

44 - - vcs-svn: prefer constcmp to prefixcmp

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

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

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

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

49 - - http: get default user-agent from git_user_agent

50 - - version: add git_user_agent function

51 - - move git_version_string into version.c

40 +Will merge to master.

41

53 -* mm/api-credentials-doc (2012-06-03) 3 commits

54 - - api-credentials.txt: mention credential.helper explicitly

55 - - api-credentials.txt: add "see also" section

56 - - api-credentials.txt: show the big picture first

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

47

58 ---------------------------------------------------

59 -[Graduated to "master"]

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

49 +

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 +

54 +Will merge to master.

55

61 -* ef/http-o-depends-on-gvf (2012-05-31) 1 commit

62 - (merged to 'next' on 2012-05-31 at 11af7cd)

63 - + Makefile: add missing GIT-VERSION-FILE dependency

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

65 -A compilation fix.

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 -* ef/maint-rebase-error-message (2012-05-30) 1 commit

68 - (merged to 'next' on 2012-05-30 at 5194fe3)

69 - + rebase: report invalid commit correctly

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

71

71 -When "git rebase" was given a bad commit to replay the history on,

72 -its error message did not correctly give the command line argument

73 -it had trouble parsing.

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

73

75 -* jl/submodule-report-new-path-once (2012-05-29) 1 commit

76 - (merged to 'next' on 2012-05-30 at e482dd9)

77 - + submodules: print "registered for path" message only once

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

75 + - t1304: improve setfacl prerequisite setup

76

79 -"git submodule init" said "registered for path" even for a submodule

80 -that was already registered.

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

78

82 -* mm/levenstein-penalize-deletion-less (2012-05-29) 1 commit

83 - (merged to 'next' on 2012-05-30 at b2a0346)

84 - + Reduce cost of deletion in levenstein distance (4 -> 3)

79 +Not urgent; probably early post 1.7.11.

80

86 -"git tags" errored out, suggesting "git stage" while "git tag" is

87 -a far more appropriate choice.

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

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

83

89 -* nh/empty-rebase (2012-05-29) 1 commit

90 - (merged to 'next' on 2012-05-30 at 270703a)

91 - + cherry-pick: regression fix for empty commits

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

85 +commit in the resulting history.

86

93 -Fix for a new topic that happened in the 1.7.11 track.

87 +Not urgent; probably early post 1.7.11.

88

95 -* vr/rebase-autosquash-does-not-imply-i (2012-05-29) 1 commit

96 - (merged to 'next' on 2012-05-30 at 10dd3af)

97 - + Do not autosquash in case of an implied interactive rebase

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

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

91

99 -"git rebase -p" should not pay attention to rebase.autosquash nor

100 -"git rebase -p --autosquash".

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

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

94

95 --------------------------------------------------

96 [Stalled]

97

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 +

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

109 - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

110 - http: Avoid limit of retrying request only twice

@@ -117,9 +120,6 @@ Rewords the status message of "git push" that pushed only one ref

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

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

122

120 -It probably is a better idea to add a message that says that the

121 -current was not pushed to address the problem in a more direct way.

122 -

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

124 - completion: split __git_ps1 into a separate script

125 - completion: remove executable mode

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

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

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

144

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

146 - - WIP: the message is bogus in apply:::check_patch()

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

@@ -213,31 +213,84 @@ not working :-(.

213 --------------------------------------------------

214 [Cooking]

215

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

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

218 - - Unindent excluded_from_list()

216 +* 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

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

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

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

224

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

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

222 -without wildcard literally.

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

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

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

228 +also updated.

229

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

230 +Not urgent; probably early post 1.7.11.

231 +

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

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

234 + + request-pull: really favor a matching tag

235 +

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

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

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

239 +

240 +Not urgent; probably early post 1.7.11.

241 +

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

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

244 + - vcs-svn: fix signedness warnings

245 + - vcs-svn: prefer strstr over memmem

246 + - vcs-svn: prefer constcmp to prefixcmp

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

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

249 +

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?

252 +

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

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

255 + + http: get default user-agent from git_user_agent

256 + + version: add git_user_agent function

257 + + move git_version_string into version.c

258 +

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.

270

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

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

273

274 +Not urgent; probably early post 1.7.11.

275 +

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

230 - - clone: allow --no-local to turn off local optimizations

231 - - docs/clone: mention that --local may be ignored

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

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

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

280

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

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

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

284 use the optimization.

285

286 +Not urgent; probably early post 1.7.11.

287 +

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

239 - - docs: drop antique comment from Makefile

240 - - docs: drop asciidoc7compatible flag

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

290 + + docs: drop antique comment from Makefile

291 + + docs: drop asciidoc7compatible flag

292 +

293 +Not urgent; probably early post 1.7.11.

294

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

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

@@ -246,6 +299,8 @@ use the optimization.

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 +

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

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

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

@@ -255,17 +310,27 @@ https:// transport is added to the contrib/ area.

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

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

312

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

313 +Not urgent; probably early post 1.7.11.

314 +

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

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

317 - submodule: fix sync handling of some relative superproject origin URLs

318 - submodule: document failure to handle relative superproject origin URLs

319 - submodule: additional regression tests for relative URLs

320

264 -* mm/push-default-switch-warning (2012-04-26) 2 commits

265 - - t5541: warning message is given even with --quiet

321 +Makes "git submodule" deal with nested submodule structure where a

322 +module is contained within a module whose origin is specified as a

323 +relative URL to its superproject's origin.

324 +

325 +Not urgent; probably early post 1.7.11.

326 +

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

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

329

268 -Will squash the two, but this has to wait for a few release cycles.

330 +Will merge to next after 1.7.11.

331 +

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

333 +1.7.13 at the latest.

334

335 --------------------------------------------------

336 [Discarded]

What's cooking (2012/06 #02)