447b158af7 · matheusbsbs/matheus-bagliano

@@ -1,26 +1,29 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Nov 2013, #01; Fri, 1)

4 -X-master-at: aa2706463fdeb51d6f9d0e267113b251888cf7f5

5 -X-next-at: 895133908010cd8192e1783286fa28ed6538f61f

3 +Subject: What's cooking in git.git (Nov 2013, #02; Wed, 6)

4 +X-master-at: 6ba01babcd37e92e88221fcf35ee4471aa66bf4c

5 +X-next-at: 1ea5b1861e50543207d31c936d4f7bbd4571e433

6

7 -What's cooking in git.git (Nov 2013, #01; Fri, 1)

7 +What's cooking in git.git (Nov 2013, #02; Wed, 6)

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 -An early preview 1.8.5-rc0 has been tagged. There still are handful

15 -of fixes and enhancements left in 'next' that I'd like to see in the

16 -final, which will hopefully be in when the first release candidate

17 -is tagged.

14 +The first release candidate 1.8.5-rc1 has been tagged.

15

16 As promised/requested, the final steps for 2.0 are in 'next'; they,

17 together with a handful topics that have been merged to 'next'

18 fairly recently, will _not_ be part of the upcoming 1.8.5 release,

19 but will be carried over in 'next' to the next cycle.

20

21 +There is a proposed rewording of advice message from "git push"

22 +patch, which is tentatively queued near the tip of 'pu' for now; it

23 +would be nice to get a few more sets of eyeballs. I am not sure if

24 +we should merge it before the 1.8.5 final, yet (we have i18n to

25 +worry about, among other things).

26 +

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

28 of the repositories listed at

29

@@ -29,119 +32,153 @@ of the repositories listed at

32 --------------------------------------------------

33 [Graduated to "master"]

34

32 -* ap/remote-hg-unquote-cquote (2013-10-23) 1 commit

33 - (merged to 'next' on 2013-10-28 at 6b99fd5)

34 - + remote-hg: unquote C-style paths when exporting

35 +* ak/cvsserver-stabilize-use-of-hash-keys (2013-10-30) 1 commit

36 + (merged to 'next' on 2013-11-01 at cc3b890)

37 + + cvsserver: Determinize output to combat Perl 5.18 hash randomization

38

36 - A fast-import stream expresses a pathname with funny characters by

37 - quoting them in C style; remote-hg remote helper forgot to unquote

38 - such a path.

39 + Perl portability fix.

40

41

41 -* jk/for-each-ref-skip-parsing (2013-10-30) 1 commit

42 - (merged to 'next' on 2013-10-30 at 56ea310)

43 - + for-each-ref: avoid loading objects to print %(objectname)

42 +* bw/solaris-sed-tr-test-portability (2013-11-04) 3 commits

43 + (merged to 'next' on 2013-11-04 at c2c09e28)

44 + + t4015: simplify sed command that is not even seen by sed

45 + (merged to 'next' on 2013-11-01 at f04be9a)

46 + + Avoid difference in tr semantics between System V and BSD

47 + + Change sed i\ usage to something Solaris' sed can handle

48

49 + Shell script portability fix.

50

46 -* jk/pack-corruption-post-mortem (2013-10-25) 1 commit

47 - (merged to 'next' on 2013-10-30 at 2248df6)

48 - + howto: add article on recovering a corrupted object

51

52 +* fc/trivial (2013-10-31) 13 commits

53 + (merged to 'next' on 2013-11-04 at c608324)

54 + + setup: trivial style fixes

55 + + run-command: trivial style fixes

56 + + diff: trivial style fix

57 + + revision: trivial style fixes

58 + + pretty: trivial style fix

59 + + describe: trivial style fixes

60 + + transport-helper: trivial style fix

61 + + sha1-name: trivial style cleanup

62 + + branch: trivial style fix

63 + + revision: add missing include

64 + + doc/pull: clarify the illustrations

65 + + t: replace pulls with merges

66 + + merge: simplify ff-only option

67

51 -* jk/reset-p-current-head-fix (2013-10-25) 2 commits

52 - (merged to 'next' on 2013-10-30 at 37ae6e0)

53 - + reset: pass real rev name to add--interactive

54 - + add-interactive: handle unborn branch in patch mode

68 + A random collection of style fixes and minor doc updates.

69

56 - "git reset -p HEAD" has codepath to special case it from resetting

57 - to contents of other commits, but recent change broke it.

70

71 +* jk/duplicate-objects-in-packs (2013-10-31) 1 commit

72 + (merged to 'next' on 2013-11-01 at 8951339)

73 + + Fix '\%o' for printf from coreutils

74

60 -* jl/submodule-mv (2013-10-13) 1 commit

61 - (merged to 'next' on 2013-10-28 at 8dc9b31)

62 - + mv: Fix spurious warning when moving a file in presence of submodules

75 + Test fixup to a topic recently graduated.

76

64 - Moving a regular file in a repository with a .gitmodules file was

65 - producing a warning 'Could not find section in .gitmodules where

66 - path=<filename>'.

77

78 +* jk/subtree-install-fix (2013-10-30) 1 commit

79 + (merged to 'next' on 2013-11-01 at 531bd79)

80 + + subtree: add makefile target for html docs

81 +

82 + We did not generate HTML version of documentation to "git subtree"

83 + in contrib/.

84 +

85 +

86 +* jk/wrap-perl-used-in-tests (2013-10-29) 2 commits

87 + (merged to 'next' on 2013-11-01 at 73444c5)

88 + + t: use perl instead of "$PERL_PATH" where applicable

89 + + t: provide a perl() function which uses $PERL_PATH

90 +

91 + Perl portability fix.

92 +

93 +

94 +* jn/test-prereq-perl-doc (2013-10-28) 1 commit

95 + (merged to 'next' on 2013-11-01 at 4d4a8b4)

96 + + t/README: tests can use perl even with NO_PERL

97

69 -* js/test-help-format-windows-port-fix (2013-10-30) 1 commit

70 - (merged to 'next' on 2013-10-30 at b98e991)

71 - + t3200: do not open a HTML manual page when DEFAULT_MAN_FORMAT is html

98 + The interaction between use of Perl in our test suite and NO_PERL

99 + has been clarified a bit.

100

101

74 -* js/tests-windows-port-fix (2013-10-28) 3 commits

75 - (merged to 'next' on 2013-10-30 at 61f8e24)

76 - + tests: undo special treatment of CRLF for Windows

77 - + Windows: a test_cmp that is agnostic to random LF <> CRLF conversions

78 - + t5300-pack-object: do not compare binary data using test_cmp

102 +* sc/doc-howto-dumb-http (2013-10-28) 1 commit

103 + (merged to 'next' on 2013-11-01 at a734b6e)

104 + + doc/howto: warn about (dumb)http server document being too old

105

106 + An ancient How-To on serving Git repositories on an HTTP server

107 + lacked a warning that it has been mostly superseded with more

108 + modern way.

109

81 -* rs/web-browse-xdg-open (2013-10-30) 1 commit

82 - (merged to 'next' on 2013-10-30 at 37d6eb4)

83 - + web--browse: Add support for xdg-open

110

111 +* vd/doc-unpack-objects (2013-11-01) 2 commits

112 + (merged to 'next' on 2013-11-01 at 443d0f4)

113 + + Documentation: "pack-file" is not literal in unpack-objects

114 + + Documentation: restore a space in unpack-objects usage

115

86 -* sb/refs-code-cleanup (2013-10-28) 2 commits

87 - (merged to 'next' on 2013-10-30 at a9bf06a)

88 - + cache: remove unused function 'have_git_dir'

89 - + refs: remove unused function invalidate_ref_cache

116 + The synopsis section of "git unpack-objects" documentation has been

117 + clarified a bit.

118

119 --------------------------------------------------

120 [New Topics]

121

94 -* fc/trivial (2013-10-31) 13 commits

95 - - setup: trivial style fixes

96 - - run-command: trivial style fixes

97 - - diff: trivial style fix

98 - - revision: trivial style fixes

99 - - pretty: trivial style fix

100 - - describe: trivial style fixes

101 - - transport-helper: trivial style fix

102 - - sha1-name: trivial style cleanup

103 - - branch: trivial style fix

104 - - revision: add missing include

105 - - doc/pull: clarify the illustrations

106 - - t: replace pulls with merges

107 - - merge: simplify ff-only option

122 +* cc/remote-remove-redundant-postfixcmp (2013-11-06) 2 commits

123 + (merged to 'next' on 2013-11-06 at 7b45219)

124 + + Rename suffixcmp() to has_suffix() and invert its result

125 + (merged to 'next' on 2013-11-04 at 6408502)

126 + + builtin/remote: remove postfixcmp() and use suffixcmp() instead

127

109 - A random collection of style fixes and minor doc updates.

128 + Minor code clean-up.

129

111 - Will merge to 'next'.

130 + Can wait in 'next'.

131

132

114 -* jk/duplicate-objects-in-packs (2013-10-31) 1 commit

115 - (merged to 'next' on 2013-11-01 at 8951339)

116 - + Fix '\%o' for printf from coreutils

133 +* tb/clone-ssh-with-colon-for-port (2013-11-04) 1 commit

134 + . git clone: is an URL local or ssh

135

118 - Test fixup to a topic recently graduated.

136 + Still being reworked.

137

120 - Will merge to 'master'.

138

139 +* cn/thin-push-capability (2013-11-06) 2 commits

140 + - send-pack: only send a thin pack if the server supports it

141 + - receive-pack: advertise thin-pack

142

123 -* rr/for-each-ref-decoration (2013-10-31) 4 commits

124 - - fixup! for-each-ref: introduce %(upstream:track[short])

125 - - for-each-ref: introduce %(upstream:track[short])

126 - - for-each-ref: introduce %(HEAD) asterisk marker

127 - - for-each-ref: introduce %C(...) for color

143 + Peff had a good suggestion to control this by expressing what the

144 + receiving end wants in a more direct way, namely to advertise a

145 + 'no-thin' trait in the capability list.

146

147

130 -* vd/doc-unpack-objects (2013-11-01) 2 commits

131 - (merged to 'next' on 2013-11-01 at 443d0f4)

132 - + Documentation: "pack-file" is not literal in unpack-objects

133 - + Documentation: restore a space in unpack-objects usage

148 +* nd/wt-status-align-i18n (2013-11-06) 1 commit

149 + - wt-status: take the alignment burden off translators

150

135 - Will merge to 'master'.

151 + An attempt to automatically align the names in the "git status"

152 + output, taking the display width of (translated) section labels

153 + into account.

154

155

138 -* jk/two-way-merge-corner-case-fix (2013-11-01) 3 commits

139 - - t1005: add test for "read-tree --reset -u A B"

140 - - t1005: reindent

141 - - unpack-trees: fix "read-tree -u --reset A B" with conflicted index

156 +* nv/commit-gpgsign-config (2013-11-06) 1 commit

157 + - Add the commit.gpgsign option to sign all commits

158

143 - Fix a rather longstanding corner-case bug in twoway "reset to

144 - there" merge, which is most often seen in "git am --abort".

159 + Introduce commit.gpgsign configuration variable to force every

160 + commit to be GPG signed.

161 +

162 + Needs tests, perhaps?

163 +

164 +

165 +* sb/sha1-loose-object-info-check-existence (2013-11-06) 1 commit

166 + (merged to 'next' on 2013-11-06 at 1ea5b18)

167 + + sha1_loose_object_info(): do not return success on missing object

168 +

169 + "git cat-file --batch-check=ok" did not check the existence of the

170 + named object.

171 +

172 + Will merge to 'next', but I think this can wait in 'next' during

173 + the feature freeze.

174 +

175 +* gj/push-more-verbose-advice (2013-11-06) 2 commits

176 + - push: switch default from "matching" to "simple"

177 + - push: Enhance unspecified push default warning

178 +

179 + Explain 'simple' and 'matching' in "git push" advice message; the

180 + topmost patch is a rebase of jc/push-2.0-default-to-simple on top

181 + of it.

182

183 --------------------------------------------------

184 [Stalled]

@@ -247,53 +284,46 @@ of the repositories listed at

284 --------------------------------------------------

285 [Cooking]

286

250 -* jc/ref-excludes (2013-11-01) 5 commits

251 - - rev-parse: introduce --exclude=<glob> to tame wildcards

252 - - rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API

253 - - rev-list --exclude: tests

254 - - document --exclude option

255 - - revision: introduce --exclude=<glob> to tame wildcards

287 +* rr/for-each-ref-decoration (2013-10-31) 4 commits

288 + - fixup! for-each-ref: introduce %(upstream:track[short])

289 + - for-each-ref: introduce %(upstream:track[short])

290 + - for-each-ref: introduce %(HEAD) asterisk marker

291 + - for-each-ref: introduce %C(...) for color

292

257 - People often wished a way to tell "git log --branches" (and "git

258 - log --remotes --not --branches") to exclude some local branches

259 - from the expansion of "--branches" (similarly for "--tags", "--all"

260 - and "--glob=<pattern>"). Now they have one.

293

294 +* jk/two-way-merge-corner-case-fix (2013-11-04) 3 commits

295 + (merged to 'next' on 2013-11-04 at 79f4fb0)

296 + + t1005: add test for "read-tree --reset -u A B"

297 + + t1005: reindent

298 + + unpack-trees: fix "read-tree -u --reset A B" with conflicted index

299

263 -* jn/test-prereq-perl-doc (2013-10-28) 1 commit

264 - (merged to 'next' on 2013-11-01 at 4d4a8b4)

265 - + t/README: tests can use perl even with NO_PERL

300 + Fix a rather longstanding corner-case bug in twoway "reset to

301 + there" merge, which is most often seen in "git am --abort".

302

267 - Will merge to 'master'.

303 + Will cook in 'next'.

304

305

270 -* ak/cvsserver-stabilize-use-of-hash-keys (2013-10-30) 1 commit

271 - (merged to 'next' on 2013-11-01 at cc3b890)

272 - + cvsserver: Determinize output to combat Perl 5.18 hash randomization

306 +* jc/ref-excludes (2013-11-01) 5 commits

307 + (merged to 'next' on 2013-11-04 at fac1ed0)

308 + + rev-parse: introduce --exclude=<glob> to tame wildcards

309 + + rev-list --exclude: export add/clear-ref-exclusion and ref-excluded API

310 + + rev-list --exclude: tests

311 + + document --exclude option

312 + + revision: introduce --exclude=<glob> to tame wildcards

313

274 - Will merge to 'master'.

314 + People often wished a way to tell "git log --branches" (and "git

315 + log --remotes --not --branches") to exclude some local branches

316 + from the expansion of "--branches" (similarly for "--tags", "--all"

317 + and "--glob=<pattern>"). Now they have one.

318 +

319 + Can wait in 'next'.

320

321

322 * jk/replace-perl-in-built-scripts (2013-10-29) 1 commit

323 (merged to 'next' on 2013-11-01 at 2384e29)

324 + use @@PERL@@ in built scripts

325

281 - Will cook in 'next'.

282 -

283 -

284 -* jk/subtree-install-fix (2013-10-30) 1 commit

285 - (merged to 'next' on 2013-11-01 at 531bd79)

286 - + subtree: add makefile target for html docs

287 -

288 - Will merge to 'master'.

289 -

290 -

291 -* jk/wrap-perl-used-in-tests (2013-10-29) 2 commits

292 - (merged to 'next' on 2013-11-01 at 73444c5)

293 - + t: use perl instead of "$PERL_PATH" where applicable

294 - + t: provide a perl() function which uses $PERL_PATH

295 -

296 - Will merge to 'master'.

326 + Can wait in 'next'.

327

328

329 * jt/commit-fixes-footer (2013-10-30) 1 commit

@@ -305,27 +335,13 @@ of the repositories listed at

335 many people stated in the thread.

336

337

308 -* sc/doc-howto-dumb-http (2013-10-28) 1 commit

309 - (merged to 'next' on 2013-11-01 at a734b6e)

310 - + doc/howto: warn about (dumb)http server document being too old

311 -

312 - Will merge to 'master'.

313 -

314 -

315 -* bw/solaris-sed-tr-test-portability (2013-10-30) 2 commits

316 - (merged to 'next' on 2013-11-01 at f04be9a)

317 - + Avoid difference in tr semantics between System V and BSD

318 - + Change sed i\ usage to something Solaris' sed can handle

319 -

320 - Will merge to 'master'.

321 -

322 -

323 -* fc/transport-helper-fixes (2013-11-01) 11 commits

338 +* fc/transport-helper-fixes (2013-11-06) 12 commits

339 - transport-helper: demote lack of "force" option to a warning

340 - transport-helper: add support to delete branches

341 - fast-export: add support to delete refs

342 - fast-import: add support to delete refs

343 - transport-helper: add support for old:new refspec

344 + - fixup! fast-export: add new --refspec option

345 - fast-export: add new --refspec option

346 - fast-export: improve argument parsing

347 - transport-helper: check for 'forced update' message

@@ -337,7 +353,7 @@ of the repositories listed at

353 ref mapping and ref deletion in a way similar to the natively

354 supported transports.

355

340 - Will merge to 'next'.

356 + Expecting a reroll to fix use of vla.

357

358

359 * jh/loose-object-dirs-creation-race (2013-10-28) 1 commit

@@ -362,7 +378,10 @@ of the repositories listed at

378 have produced a single output entry (i.e. the ref creation event),

379 but instead showed the history leading to the tag.

380

365 - Will merge to 'master'.

381 + Broken at the design level. Any reflog entry that points at a non

382 + commit needs to be handled with new code that does not exist yet,

383 + and lifting the "this code handles only commits" without adding

384 + such code does not solve anything.

385

386

387 * tr/merge-recursive-index-only (2013-10-28) 3 commits

@@ -370,6 +389,8 @@ of the repositories listed at

389 - merge-recursive: internal flag to avoid touching the worktree

390 - merge-recursive: remove dead conditional in update_stages()

391

392 + Will hold until using script appears.

393 +

394

395 * bc/http-100-continue (2013-10-31) 3 commits

396 (merged to 'next' on 2013-11-01 at e12ae23)

@@ -436,31 +457,46 @@ of the repositories listed at

457

458

459 * mh/fetch-tags-in-addition-to-normal-refs (2013-10-30) 23 commits

439 - - fetch: improve the error messages emitted for conflicting refspecs

440 - - handle_duplicate(): mark error message for translation

441 - - ref_remote_duplicates(): extract a function handle_duplicate()

442 - - ref_remove_duplicates(): simplify loop logic

443 - - t5536: new test of refspec conflicts when fetching

444 - - ref_remove_duplicates(): avoid redundant bisection

445 - - git-fetch.txt: improve description of tag auto-following

446 - - fetch-options.txt: simplify ifdef/ifndef/endif usage

447 - - fetch, remote: properly convey --no-prune options to subprocesses

448 - - builtin/remote.c:update(): use struct argv_array

449 - - builtin/remote.c: reorder function definitions

450 - - query_refspecs(): move some constants out of the loop

451 - - fetch --prune: prune only based on explicit refspecs

452 - - fetch --tags: fetch tags *in addition to* other stuff

453 - - fetch: only opportunistically update references based on command line

454 - - get_expanded_map(): avoid memory leak

455 - - get_expanded_map(): add docstring

456 - - builtin/fetch.c: reorder function definitions

457 - - get_ref_map(): rename local variables

458 - - api-remote.txt: correct section "struct refspec"

459 - - t5510: check that "git fetch --prune --tags" does not prune branches

460 - - t5510: prepare test refs more straightforwardly

461 - - t5510: use the correct tag name in test

462 -

463 - Will merge to 'next' after taking another look.

460 + (merged to 'next' on 2013-11-06 at 6932893)

461 + + fetch: improve the error messages emitted for conflicting refspecs

462 + + handle_duplicate(): mark error message for translation

463 + + ref_remote_duplicates(): extract a function handle_duplicate()

464 + + ref_remove_duplicates(): simplify loop logic

465 + + t5536: new test of refspec conflicts when fetching

466 + + ref_remove_duplicates(): avoid redundant bisection

467 + + git-fetch.txt: improve description of tag auto-following

468 + + fetch-options.txt: simplify ifdef/ifndef/endif usage

469 + + fetch, remote: properly convey --no-prune options to subprocesses

470 + + builtin/remote.c:update(): use struct argv_array

471 + + builtin/remote.c: reorder function definitions

472 + + query_refspecs(): move some constants out of the loop

473 + + fetch --prune: prune only based on explicit refspecs

474 + + fetch --tags: fetch tags *in addition to* other stuff

475 + + fetch: only opportunistically update references based on command line

476 + + get_expanded_map(): avoid memory leak

477 + + get_expanded_map(): add docstring

478 + + builtin/fetch.c: reorder function definitions

479 + + get_ref_map(): rename local variables

480 + + api-remote.txt: correct section "struct refspec"

481 + + t5510: check that "git fetch --prune --tags" does not prune branches

482 + + t5510: prepare test refs more straightforwardly

483 + + t5510: use the correct tag name in test

484 +

485 + The "-tags" option to "git fetch" used to be literally a synonym to

486 + a "refs/tags/*:refs/tags/*" refspec, which meant that (1) as an

487 + explicit refspec given from the command line, it silenced the lazy

488 + "git fetch" default that is configured, and (2) also as an explicit

489 + refspec given from the command line, it interacted with "--prune"

490 + to remove any tag that the remote we are fetching from does not

491 + have.

492 +

493 + This demotes it to an option; with it, we fetch all tags in

494 + addition to what would be fetched without the option, and it does

495 + not interact with the decision "--prune" makes to see what

496 + remote-tracking refs the local has are missing the remote

497 + counterpart.

498 +

499 + Will cook in 'next'.

500

501

502 * nv/parseopt-opt-arg (2013-10-31) 2 commits

@@ -496,7 +532,7 @@ of the repositories listed at

532 so that scripts that used multiple arguments but added their own

533 extra layer of quoting are not broken.

534

499 - Will cook in 'next' for the rest of this cycle.

535 + Will cook in 'next'.

536

537

538 * kb/fast-hashmap (2013-10-22) 12 commits

What's cooking (2013/11 #02)