0862875e08 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jul 2013, #10; Wed, 31)

4 -X-master-at: 8dc84fdc48a79c70682e6c361a82d0f3e1db9a03

5 -X-next-at: 025c443e44c008c3a3dd7b83658f4e9734343e53

3 +Subject: What's cooking in git.git (Aug 2013, #01; Thu, 1)

4 +X-master-at: 304852fc77847e649c746db95e9c4675c03ee567

5 +X-next-at: d151a9437b346971b08e58455c2b1333b2139cdc

6

7 -What's cooking in git.git (Jul 2013, #10; Wed, 31)

7 +What's cooking in git.git (Aug 2013, #01; Thu, 1)

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 -Hopefully the 1.8.4-rc1 tomorrow with topics marked for 'master'

15 -in this issue of "What's cooking" report.

14 +The first release candidate v1.8.4-rc1 has been tagged; only

15 +regression fixes and l10n updates from now on.

16

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

18 of the repositories listed at

@@ -22,118 +22,57 @@ of the repositories listed at

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

23 [Graduated to "master"]

24

25 -* bc/completion-for-bash-3.0 (2013-07-24) 1 commit

26 - (merged to 'next' on 2013-07-24 at 913d89c)

27 - + git-completion.bash: replace zsh notation that breaks bash 3.X

28 -

29 -

30 -* ds/doc-two-kinds-of-tags (2013-07-29) 1 commit

31 - (merged to 'next' on 2013-07-30 at 1201ca7)

32 - + docs/git-tag: explain lightweight versus annotated tags

33 -

34 -

35 -* jk/capabilities-doc (2013-07-26) 5 commits

36 - (merged to 'next' on 2013-07-29 at cf3f07e)

37 - + document 'allow-tip-sha1-in-want' capability

38 - (merged to 'next' on 2013-07-24 at 5af9a33)

39 - + document 'quiet' receive-pack capability

40 - + document 'agent' protocol capability

41 - + docs: note that receive-pack knows side-band-64k capability

42 - + docs: fix 'report-status' protocol capability thinko

43 -

44 -

45 -* jk/commit-how-to-abort-cherry-pick (2013-07-29) 1 commit

46 - (merged to 'next' on 2013-07-30 at 7b1c49c)

47 - + commit: tweak empty cherry pick advice for sequencer

48 -

25 +* jc/rm-submodule-error-message (2013-07-25) 1 commit

26 + + builtin/rm.c: consolidate error reporting for removing submodules

27

50 -* mh/packed-refs-do-one-ref-recursion (2013-07-17) 1 commit

51 - (merged to 'next' on 2013-07-30 at d8cc1ee)

52 - + do_one_ref(): save and restore value of current_ref

28

54 - Fix a NULL-pointer dereference during nested iterations over

55 - references (for example, when replace references are being used).

29 +* jx/clean-interactive (2013-07-24) 2 commits

30 + (merged to 'next' on 2013-07-30 at b7fd474)

31 + + git-clean: implement partial matching for selection

32 + (merged to 'next' on 2013-07-24 at 1e63bb9)

33 + + Documentation/git-clean: fix description for range

34

35

58 -* rj/commit-slab-fix (2013-07-29) 1 commit

59 - (merged to 'next' on 2013-07-30 at 1914f37)

60 - + commit-slab.h: Fix memory allocation and addressing

36 +* lf/echo-n-is-not-portable (2013-07-29) 1 commit

37 + (merged to 'next' on 2013-07-30 at e223ceb)

38 + + Avoid using `echo -n` anywhere

39

40

63 -* rr/maint-tilde-markup-in-doc (2013-07-26) 1 commit

64 - (merged to 'next' on 2013-07-30 at c8f83d5)

65 - + config doc: quote paths, fixing tilde-interpretation

41 +* ma/hg-to-git (2013-07-23) 1 commit

42 + (merged to 'next' on 2013-07-30 at 1dddc06)

43 + + hg-to-git: --allow-empty-message in git commit

44

45

68 -* rr/rebase-autostash (2013-07-29) 1 commit

69 - (merged to 'next' on 2013-07-30 at 0095e2d)

70 - + git-rebase: fix typo

46 +* ms/subtree-install-fix (2013-07-30) 1 commit

47 + + contrib/subtree: Fix make install target

48

49

73 -* sb/mailmap-updates (2013-07-24) 1 commit

74 - (merged to 'next' on 2013-07-24 at 9f8e681)

75 - + .mailmap: combine more (email, name) to individual persons

50 +* ob/typofixes (2013-07-29) 1 commit

51 + (merged to 'next' on 2013-07-30 at ec2c897)

52 + + many small typofixes

53

54 --------------------------------------------------

55 [New Topics]

56

80 -* bc/unuse-packfile (2013-07-30) 1 commit

81 - - sha1_file: introduce close_one_pack() to close packs on fd pressure

57 +* mb/docs-favor-en-us (2013-08-01) 1 commit

58 + - Provide some linguistic guidance for the documentation.

59

60 Will merge to and cook in 'next'.

61

62

86 -* da/darwin (2013-07-30) 1 commit

87 - - imap-send: use Apple's Security framework for base64 encoding

88 -

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

90 -

91 -

92 -* jc/rm-submodule-error-message (2013-07-25) 1 commit

93 - - builtin/rm.c: consolidate error reporting for removing submodules

94 -

95 - Consolidate two messages phrased subtly differently without a good

96 - reason.

63 +* jc/parseopt-command-modes (2013-07-30) 2 commits

64 + - tag: use OPT_CMDMODE

65 + - parse-options: add OPT_CMDMODE()

66

98 - Will merge to 'next' and then to 'master', unless there is an objection.

99 -

100 -

101 -* ms/subtree-install-fix (2013-07-30) 1 commit

102 - - contrib/subtree: Fix make install target

103 -

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

105 -

106 -

107 -* nd/sq-quote-buf (2013-07-30) 3 commits

108 - - quote: remove sq_quote_print()

109 - - tar-tree: remove dependency on sq_quote_print()

110 - - for-each-ref, quote: convert *_quote_print -> *_quote_buf

111 -

112 - Code simplification as a preparatory step to something larger.

113 -

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

115 -

116 -

117 -* jc/url-match (2013-07-31) 6 commits

118 - - config: "git config --get-urlmatch" parses section.<url>.key

119 - - builtin/config: refactor collect_config()

120 - - config: parse http.<url>.<variable> using urlmatch

121 - - config: add generic callback wrapper to parse section.<url>.key

122 - - config: add helper to normalize and match URLs

123 - - http.c: fix parsing of http.sslCertPasswordProtected variable

124 -

125 - Reroll of km/http-curl-config-per-url topic.

126 -

127 - Will merge to and cook in 'next'

67 + Many commands use --dashed-option as a operation mode selector

68 + (e.g. "git tag --delete") that the user can use at most one

69 + (e.g. "git tag --delete --verify" is a nonsense) and you cannot

70 + negate (e.g. "git tag --no-delete" is a nonsense). Make it easier

71 + for users of parse_options() to enforce these restrictions.

72

73 --------------------------------------------------

74 [Stalled]

75

132 -* tr/log-full-diff-keep-true-parents (2013-07-29) 2 commits

133 - - SQUASH??? free saved-parents slab when done

134 - - [PERHAPS LIKE THIS] log: use true parents for diff even when rewriting

135 -

136 -

76 * tf/gitweb-ss-tweak (2013-07-15) 4 commits

77 - gitweb: make search help link less ugly

78 - gitweb: omit the repository owner when it is unset

@@ -239,6 +178,61 @@ of the repositories listed at

178 --------------------------------------------------

179 [Cooking]

180

181 +* tr/log-full-diff-keep-true-parents (2013-08-01) 1 commit

182 + - log: use true parents for diff even when rewriting

183 +

184 + Output from "git log --full-diff -- <pathspec>" looked strange,

185 + because comparison was done with the previous ancestor that touched

186 + the specified <pathspec>, causing the patches for paths outside the

187 + pathspec to show more than the single commit has changed.

188 +

189 + I am not sure if that is necessarily a problem, though. Output

190 + from "git log --full-diff -2 -- <pathspec>" without this change

191 + will be applicable to some codebase, but after this change that

192 + will no longer be true (you will get only tiny parts of the change

193 + that were made by the two commits in question, while missing all

194 + the other changes).

195 +

196 +

197 +* bc/unuse-packfile (2013-08-01) 2 commits

198 + - Don't close pack fd when free'ing pack windows

199 + - sha1_file: introduce close_one_pack() to close packs on fd pressure

200 +

201 + Will merge to and cook in 'next'.

202 +

203 +

204 +* da/darwin (2013-07-30) 1 commit

205 + (merged to 'next' on 2013-08-01 at d151a94)

206 + + imap-send: use Apple's Security framework for base64 encoding

207 +

208 + Will cook in 'next'.

209 +

210 +

211 +* nd/sq-quote-buf (2013-07-30) 3 commits

212 + (merged to 'next' on 2013-08-01 at dc7934a)

213 + + quote: remove sq_quote_print()

214 + + tar-tree: remove dependency on sq_quote_print()

215 + + for-each-ref, quote: convert *_quote_print -> *_quote_buf

216 +

217 + Code simplification as a preparatory step to something larger.

218 +

219 + Will cook in 'next'.

220 +

221 +

222 +* jc/url-match (2013-07-31) 6 commits

223 + - config: "git config --get-urlmatch" parses section.<url>.key

224 + - builtin/config: refactor collect_config()

225 + - config: parse http.<url>.<variable> using urlmatch

226 + - config: add generic callback wrapper to parse section.<url>.key

227 + - config: add helper to normalize and match URLs

228 + - http.c: fix parsing of http.sslCertPasswordProtected variable

229 +

230 + Reroll of km/http-curl-config-per-url topic. Peff raises many good

231 + points about the tests for http.* variables.

232 +

233 + Waiting for the discussion to conclude, hopefully with a replacement test.

234 +

235 +

236 * jl/submodule-mv (2013-07-30) 5 commits

237 - rm: delete .gitmodules entry of submodules removed from the work tree

238 - mv: update the path entry in .gitmodules for moved submodules

@@ -254,20 +248,6 @@ of the repositories listed at

248 Waiting for a reroll.

249

250

257 -* ob/typofixes (2013-07-29) 1 commit

258 - (merged to 'next' on 2013-07-30 at ec2c897)

259 - + many small typofixes

260 -

261 - Will merge to 'next'.

262 -

263 -

264 -* ma/hg-to-git (2013-07-23) 1 commit

265 - (merged to 'next' on 2013-07-30 at 1dddc06)

266 - + hg-to-git: --allow-empty-message in git commit

267 -

268 - Will merge to 'master'.

269 -

270 -

251 * nd/clone-connectivity-shortcut (2013-07-23) 1 commit

252 (merged to 'next' on 2013-07-30 at 8d16721)

253 + smart http: use the same connectivity check on cloning

@@ -275,15 +255,6 @@ of the repositories listed at

255 Will cook in 'next'.

256

257

278 -* jx/clean-interactive (2013-07-24) 2 commits

279 - (merged to 'next' on 2013-07-30 at b7fd474)

280 - + git-clean: implement partial matching for selection

281 - (merged to 'next' on 2013-07-24 at 1e63bb9)

282 - + Documentation/git-clean: fix description for range

283 -

284 - Will merge to 'master'.

285 -

286 -

258 * db/http-savecookies (2013-07-30) 1 commit

259 (merged to 'next' on 2013-07-30 at d2ad6e5)

260 + http: add http.savecookies option to write out HTTP cookies

@@ -291,13 +262,6 @@ of the repositories listed at

262 Will cook in 'next'.

263

264

294 -* lf/echo-n-is-not-portable (2013-07-29) 1 commit

295 - (merged to 'next' on 2013-07-30 at e223ceb)

296 - + Avoid using `echo -n` anywhere

297 -

298 - Will merge to 'master'.

299 -

300 -

265 * sb/fsck-opt-bool (2013-07-29) 1 commit

266 (merged to 'next' on 2013-07-30 at 8a9964c)

267 + fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL

@@ -464,7 +428,9 @@ of the repositories listed at

428 Will hold, until we get any user.

429

430

467 -* jc/push-cas (2013-07-22) 6 commits

431 +* jc/push-cas (2013-08-01) 7 commits

432 + (merged to 'next' on 2013-08-01 at a7604ee)

433 + + t5540/5541: smart-http does not support "--force-with-lease"

434 (merged to 'next' on 2013-07-23 at 72371b0)

435 + t5533: test "push --force-with-lease"

436 + push --force-with-lease: tie it all together

@@ -487,6 +453,9 @@ of the repositories listed at

453 defeating the safety pretty easily). It is suitable only for the

454 simplest workflows, and it may hurt users more than it helps them.

455

456 + Also, smart-http needs to be taught about this before we can move

457 + it forward.

458 +

459 Will cook in 'next'.

460

461

@@ -509,7 +478,8 @@ of the repositories listed at

478

479

480 * rj/cygwin-clarify-use-of-cheating-lstat (2013-07-18) 1 commit

512 - - cygwin: Remove the Win32 l/stat() implementation

481 + (merged to 'next' on 2013-08-01 at 3ebfe7c)

482 + + cygwin: Remove the Win32 l/stat() implementation

483

484 Cygwin port added a "not quite correct but a lot faster and good

485 enough for many lstat() calls that are only used to see if the

@@ -517,7 +487,11 @@ of the repositories listed at

487 time ago, and it started biting us in places. This removes it and

488 uses the standard lstat() that comes with Cygwin.

489

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

490 + Recent topic that uses lstat on packed-refs file is broken when

491 + this cheating lstat is used, and this is a simplest fix that is

492 + also the cleanest direction to go in the long run.

493 +

494 + Will merge to 'master'.

495

496

497 * jc/reflog-doc (2013-06-19) 1 commit

@@ -589,4 +563,3 @@ of the repositories listed at

563 + http.c: fix parsing of http.sslCertPasswordProtected variable

564

565 Reverted to be replaced with a reroll (jc/url-match topic).

592 -

What's cooking (2013/08 #01)