c9bbe82071 · matheusbsbs/matheus-bagliano

@@ -1,257 +1,93 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Sep 2014, #05; Fri, 19)

3 +Subject: What's cooking in git.git (Sep 2014, #06; Wed, 24)

4 X-master-at: 97b8860c071898d9e162678ea1035a8ced2f8b1f

5 -X-next-at: 7a54a76ab8dddf4a52b3453b206ed4b8f4200891

5 +X-next-at: b8dfbefaa44d81ef4d724788e2b9e387ee7a8bf8

6

7 -What's cooking in git.git (Sep 2014, #05; Fri, 19)

7 +What's cooking in git.git (Sep 2014, #06; Wed, 24)

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 -Many topics that have been cooking in 'next' are now in 'master'.

15 -

16 -For some unknown reason, we ended up seeing that multiple people

17 -simultaneously cooking topics that are all on the larger side

18 -(i.e. dozen patches or more). Inevitably larger topics tend to need

19 -more rerolls, and they haven't really hit my tree quite yet, even

20 -though many have been receiving and responding to reviews quite

21 -actively. Hopefully some may be able to hit 'next' by the end of

22 -6th week of this cycle (i.e. early to mid October), or they would

23 -have to wait until the next cycle.

24 -

25 -On the 'maint' front, the first maintenance release for v2.1.x

26 -series is out, downmerging the fixes that are already on 'master'

27 -accumulated since v2.1.0.

28 -

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

15 of the repositories listed at

16

17 http://git-blame.blogspot.com/p/git-public-repositories.html

18

19 --------------------------------------------------

35 -[Graduated to "master"]

36 -

37 -* ah/grammofix (2014-09-02) 1 commit

38 - (merged to 'next' on 2014-09-12 at 58fbb44)

39 - + grammofix in user-facing messages

40 -

41 -

42 -* as/calloc-takes-nmemb-then-size (2014-09-03) 1 commit

43 - (merged to 'next' on 2014-09-12 at a287484)

44 - + calloc() and xcalloc() takes nmemb and then size

45 -

46 - Code clean-up.

47 -

48 -

49 -* bb/date-iso-strict (2014-08-29) 1 commit

50 - (merged to 'next' on 2014-09-12 at c9d415d)

51 - + pretty: provide a strict ISO 8601 date format

52 -

53 - "log --date=iso" uses a slight variant of ISO 8601 format that is

54 - made more human readable. A new "--date=iso-strict" option gives

55 - datetime output that is more strictly conformant.

56 -

57 -

58 -* da/styles (2014-09-02) 1 commit

59 - (merged to 'next' on 2014-09-12 at a22322e)

60 - + stylefix: asterisks stick to the variable, not the type

61 -

62 -

63 -* ir/makefile-typofix (2014-09-15) 1 commit

64 - (merged to 'next' on 2014-09-18 at bc1c273)

65 - + Makefile: fix some typos in the preamble

66 -

67 -

68 -* jc/parseopt-verify-short-name (2014-09-04) 1 commit

69 - (merged to 'next' on 2014-09-12 at 43dba24)

70 - + parse-options: detect attempt to add a duplicate short option name

71 -

72 - Add checks for a common programming mistake to assign the same

73 - short option name to two separate options to help developers.

74 -

75 -

76 -* jk/commit-author-parsing (2014-08-29) 6 commits

77 - (merged to 'next' on 2014-09-12 at cfbb6b6)

78 - + determine_author_info(): copy getenv output

79 - + determine_author_info(): reuse parsing functions

80 - + date: use strbufs in date-formatting functions

81 - + record_author_date(): use find_commit_header()

82 - + record_author_date(): fix memory leak on malformed commit

83 - + commit: provide a function to find a header in a buffer

84 -

85 - Code clean-up.

86 -

87 -

88 -* jk/fast-export-anonymize (2014-08-28) 2 commits

89 - (merged to 'next' on 2014-09-12 at 0af10fa)

90 - + docs/fast-export: explain --anonymize more completely

91 - + teach fast-export an --anonymize option

92 -

93 - Sometimes users want to report a bug they experience on their

94 - repository, but they are not at liberty to share the contents of

95 - the repository. "fast-export" was taught an "--anonymize" option

96 - to replace blob contents, names of people and paths and log

97 - messages with bland and simple strings to help them.

98 -

99 -

100 -* jk/fsck-exit-code-fix (2014-09-12) 2 commits

101 - (merged to 'next' on 2014-09-18 at 34c696f)

102 - + fsck: return non-zero status on missing ref tips

103 - + fsck: exit with non-zero status upon error from fsck_obj()

104 -

105 - "git fsck" failed to report that it found corrupt objects via its

106 - exit status in some cases.

107 -

108 -

109 -* jk/index-pack-threading-races (2014-08-29) 1 commit

110 - (merged to 'next' on 2014-09-12 at 9241312)

111 - + index-pack: fix race condition with duplicate bases

112 -

113 - When receiving an invalid pack stream that records the same object

114 - twice, multiple threads got confused due to a race. We should

115 - reject or correct such a stream upon receiving, but that will be a

116 - larger change.

117 -

118 -

119 -* jk/send-pack-many-refspecs (2014-08-26) 1 commit

120 - (merged to 'next' on 2014-09-12 at 7f4ae4e)

121 - + send-pack: take refspecs over stdin

122 -

123 - The number of refs that can be pushed at once over smart HTTP was

124 - limited by the command line length. The limitation has been lifted

125 - by passing these refs from the standard input of send-pack.

126 -

127 -

128 -* jp/index-with-corrupt-stages (2014-08-29) 2 commits

129 - (merged to 'next' on 2014-09-12 at 54016d5)

130 - + read_index_unmerged(): remove unnecessary loop index adjustment

131 - + read_index_from(): catch out of order entries when reading an index file

132 -

133 - A broken reimplementation of Git could write an invalid index that

134 - records both stage #0 and higher stage entries for the same path.

135 - Notice and reject such an index, as there is no sensible fallback

136 - (we do not know if the broken tool wanted to resolve and forgot to

137 - remove higher stage entries, or if it wanted to unresolve and

138 - forgot to remove the stage#0 entry).

139 -

140 -

141 -* js/no-test-cmp-for-binaries (2014-09-12) 1 commit

142 - (merged to 'next' on 2014-09-15 at c5609e9)

143 - + t9300: use test_cmp_bin instead of test_cmp to compare binary files

144 -

145 -

146 -* kb/perf-trace (2014-09-08) 1 commit

147 - (merged to 'next' on 2014-09-12 at 371df71)

148 - + trace: correct trace_strbuf() parameter type for !HAVE_VARIADIC_MACROS

149 -

150 - Compilation fix for some compilers.

151 -

152 -

153 -* mb/build-contrib-svn-fe (2014-08-28) 1 commit

154 - (merged to 'next' on 2014-09-12 at acb252b)

155 - + contrib/svn-fe: fix Makefile

156 -

157 -

158 -* mb/fast-import-delete-root (2014-08-29) 2 commits

159 - (merged to 'next' on 2014-09-12 at d0fda49)

160 - + fast-import: fix segfault in store_tree()

161 - + t9300: test filedelete command

20 +[New Topics]

21

163 - An attempt to remove the entire tree in the "git fast-import" input

164 - stream caused it to misbehave.

22 +* nd/archive-pathspec (2014-09-22) 1 commit

23 + - archive: support filtering paths with glob

24

25 + "git archive" learned to filter what gets archived with pathspec.

26

167 -* mk/reachable-protect-detached-head (2014-09-03) 1 commit

168 - (merged to 'next' on 2014-09-12 at de2b50b)

169 - + reachable.c: add HEAD to reachability starting commits

170 -

171 -

172 -* mr/mark-i18n-log-rerere (2014-09-15) 2 commits

173 - (merged to 'next' on 2014-09-15 at ba35eb3)

174 - + builtin/log.c: mark strings for translation

175 - + rerere.h: mark string for translation

176 -

177 -

178 -* rs/export-strbuf-addchars (2014-09-08) 2 commits

179 - (merged to 'next' on 2014-09-12 at 8b25fe0)

180 - + strbuf: use strbuf_addchars() for adding a char multiple times

181 - + strbuf: export strbuf_addchars()

182 -

183 - Code clean-up.

184 -

185 -

186 -* rs/merge-tree-simplify (2014-09-02) 1 commit

187 - (merged to 'next' on 2014-09-12 at 5b4c349)

188 - + merge-tree: remove unused df_conflict arguments

189 -

190 - Code clean-up.

27 + Will merge to 'next'.

28

29

193 -* rs/more-uses-of-skip-prefix (2014-09-02) 2 commits

194 - (merged to 'next' on 2014-09-12 at 156a436)

195 - + pack-write: simplify index_pack_lockfile using skip_prefix() and xstrfmt()

196 - + connect: simplify check_ref() using skip_prefix() and starts_with()

30 +* rs/graph-simplify (2014-09-22) 1 commit

31 + (merged to 'next' on 2014-09-23 at 72969e2)

32 + + graph: simplify graph_padding_line()

33

198 - Code clean-up.

34 + Will merge to 'master'.

35

36

201 -* rs/simplify-config-include (2014-09-02) 1 commit

202 - (merged to 'next' on 2014-09-12 at e4ffd6d)

203 - + config: simplify git_config_include()

37 +* rs/remote-simplify (2014-09-22) 1 commit

38 + (merged to 'next' on 2014-09-23 at 176e316)

39 + + remote: simplify match_name_with_pattern() using strbuf

40

205 - Code clean-up.

41 + Will merge to 'master'.

42

43

208 -* rs/simplify-http-walker (2014-09-02) 1 commit

209 - (merged to 'next' on 2014-09-12 at b5178d2)

210 - + http-walker: simplify process_alternates_response() using strbuf

44 +* sb/merge-recursive-copy-paste-fix (2014-09-23) 2 commits

45 + (merged to 'next' on 2014-09-24 at b8dfbef)

46 + + merge-recursive: remove stale commented debugging code

47 + + merge-recursive: fix copy-paste mistake

48

212 - Code clean-up.

49 + "git merge-recursive" had a small bug that could have made it

50 + mishandle "one side deleted, the other side did not touch it" in a

51 + rare corner case, where the other side actually did touch to cause

52 + the blob object names to be different but both blobs before and

53 + after the change normalize to the same (e.g. correcting mistake to

54 + check in a blob with CRLF line endings by replacing it with another

55 + blob that records the same contents with LF line endings).

56

57 + Will merge to 'master'.

58

215 -* so/rebase-doc (2014-09-16) 1 commit

216 - (merged to 'next' on 2014-09-18 at cce521d)

217 - + Documentation/git-rebase.txt: <upstream> must be given to specify <branch>

59

60 +* sb/t6031-typofix (2014-09-22) 1 commit

61 + (merged to 'next' on 2014-09-23 at aec57a9)

62 + + t6031-test-merge-recursive: do not forget to add file to be committed

63

220 -* sp/doc-update-index-cacheinfo (2014-09-11) 1 commit

221 - (merged to 'next' on 2014-09-15 at 11ec716)

222 - + Documentation: use single-parameter --cacheinfo in example

64 + Will merge to 'master'.

65

66

225 -* ss/compat-default-source-for-newer-gnu (2014-09-15) 1 commit

226 - (merged to 'next' on 2014-09-15 at 0e87594)

227 - + compat-util: add _DEFAULT_SOURCE define

67 +* sb/t9300-typofix (2014-09-22) 1 commit

68 + (merged to 'next' on 2014-09-23 at aa519bd)

69 + + t9300-fast-import: fix typo in test description

70

71 + Will merge to 'master'.

72

230 -* ta/config-add-to-empty-or-true-fix (2014-09-11) 2 commits

231 - (merged to 'next' on 2014-09-15 at af779a7)

232 - + config: avoid a funny sentinel value "a^"

233 - (merged to 'next' on 2014-08-29 at d219212)

234 - + make config --add behave correctly for empty and NULL values

73

236 - "git config --add section.var val" used to lose existing

237 - section.var whose value was an empty string.

74 +* so/rebase-doc-fork-point (2014-09-22) 1 commit

75 + - Documentation/git-rebase.txt: document when --fork-point is auto-enabled

76

77

240 -* tb/complete-diff-ignore-blank-lines (2014-09-03) 1 commit

241 - (merged to 'next' on 2014-09-12 at 1b7d259)

242 - + completion: Add --ignore-blank-lines for diff

78 +* sk/tag-contains-wo-recursion (2014-09-23) 1 commit

79 + - t7004: give the test a bit more stack space

80

81

245 -* tb/crlf-tests (2014-09-02) 3 commits

246 - (merged to 'next' on 2014-09-12 at 2c950af)

247 - + MinGW: update tests to handle a native eol of crlf

248 - + Makefile: propagate NATIVE_CRLF to C

249 - + t0027: Tests for core.eol=native, eol=lf, eol=crlf

82 +* jt/itimer-autoconf (2014-08-29) 3 commits

83 + - autoconf: check for setitimer()

84 + - autoconf: check for struct itimerval

85 + - git-compat-util.h: add missing semicolon after struct itimerval

86 + (this branch is used by jt/timer-settime.)

87

88 + Split the early part of jt/timer-settime topic out into a topic.

89

252 -* wk/pre-push-sample-hook (2014-09-11) 1 commit

253 - (merged to 'next' on 2014-09-18 at 6f8c9d7)

254 - + pre-push.sample: Write error message to stderr

90 + Will merge to 'next'.

91

92 --------------------------------------------------

93 [Stalled]

@@ -311,16 +147,14 @@ of the repositories listed at

147 Kicked back to 'pu' per request ($gmane/255610).

148

149

314 -* jt/timer-settime (2014-08-29) 9 commits

150 +* jt/timer-settime (2014-08-29) 6 commits

151 - use timer_settime() for new platforms

152 - autoconf: check for timer_settime()

153 - autoconf: check for struct itimerspec

154 - autoconf: check for struct sigevent

155 - autoconf: check for struct timespec

156 - autoconf: check for timer_t

321 - - autoconf: check for setitimer()

322 - - autoconf: check for struct itimerval

323 - - git-compat-util.h: add missing semicolon after struct itimerval

157 + (this branch uses jt/itimer-autoconf.)

158

159 Reviewed, discussed and wanting for a reroll.

160

@@ -517,22 +351,28 @@ of the repositories listed at

351

352

353 * da/rev-parse-verify-quiet (2014-09-19) 4 commits

520 - - stash: prefer --quiet over shell redirection of the standard error stream

521 - - refs: make rev-parse --quiet actually quiet

522 - - t1503: use test_must_be_empty

523 - - Documentation: a note about stdout for git rev-parse --verify --quiet

354 + (merged to 'next' on 2014-09-23 at 5ed184a)

355 + + stash: prefer --quiet over shell redirection of the standard error stream

356 + + refs: make rev-parse --quiet actually quiet

357 + + t1503: use test_must_be_empty

358 + + Documentation: a note about stdout for git rev-parse --verify --quiet

359

360 "rev-parse --verify --quiet $name" is meant to quietly exit with a

361 non-zero status when $name is not a valid object name, but still

362 gave error messages in some cases.

363

529 - Will merge to 'next'.

364 + Will merge to 'master'.

365

366

367 * hj/pretty-naked-decoration (2014-09-18) 1 commit

533 - - pretty: add %D format specifier

368 + (merged to 'next' on 2014-09-23 at fb699c4)

369 + + pretty: add %D format specifier

370

535 - Will merge to 'next'.

371 + The pretty-format specifier "%d", which expanded to " (tagname)"

372 + for a tagged commit, gained a cousin "%D" that just gives the

373 + "tagname" without frills.

374 +

375 + Will merge to 'master'.

376

377

378 * jc/ignore-sigpipe-while-running-hooks (2014-09-16) 1 commit

@@ -554,7 +394,9 @@ of the repositories listed at

394 Will merge to 'master'.

395

396

557 -* jk/mbox-from-line (2014-09-16) 1 commit

397 +* jk/mbox-from-line (2014-09-22) 2 commits

398 + (merged to 'next' on 2014-09-23 at 506b89b)

399 + + mailinfo: work around -Wstring-plus-int warning

400 (merged to 'next' on 2014-09-19 at 314af77)

401 + mailinfo: make ">From" in-body header check more robust

402

@@ -577,39 +419,44 @@ of the repositories listed at

419 Will merge to 'master'.

420

421

580 -* pr/use-default-sigpipe-setting (2014-09-18) 1 commit

581 - - unblock and unignore SIGPIPE

422 +* pr/use-default-sigpipe-setting (2014-09-22) 2 commits

423 + (merged to 'next' on 2014-09-24 at 2d678ed)

424 + + mingw.h: add dummy functions for sigset_t operations

425 + + unblock and unignore SIGPIPE

426

427 We used to get confused when a process called us with SIGPIPE

428 ignored; we do want to die with SIGPIPE when the output is not

429 read by default, and do ignore the signal when appropriate.

430

587 - Will merge to 'next'.

431 + Will merge to 'master'.

432

433

434 * rs/realloc-array (2014-09-18) 2 commits

591 - - use REALLOC_ARRAY for changing the allocation size of arrays

592 - - add macro REALLOC_ARRAY

435 + (merged to 'next' on 2014-09-23 at a5bb3a6)

436 + + use REALLOC_ARRAY for changing the allocation size of arrays

437 + + add macro REALLOC_ARRAY

438

439 Code cleanup.

440

596 - Will merge to 'next'.

441 + Will merge to 'master'.

442

443

444 * jk/branch-verbose-merged (2014-09-18) 1 commit

600 - - branch: clean up commit flags after merge-filter walk

445 + (merged to 'next' on 2014-09-23 at d940d15)

446 + + branch: clean up commit flags after merge-filter walk

447

448 The "--verbose" option no longer breaks "git branch --merged $it".

449

604 - Will merge to 'next'.

450 + Will merge to 'master'.

451

452

453 * sb/help-unknown-command-sort-fix (2014-09-18) 1 commit

608 - - help: fix the size passed to qsort

454 + (merged to 'next' on 2014-09-23 at 6ab29ed)

455 + + help: fix the size passed to qsort

456

457 Code cleanup.

458

612 - Will merge to 'next'.

459 + Will merge to 'master'.

460

461

462 * jc/hash-object (2014-09-11) 3 commits

@@ -623,7 +470,7 @@ of the repositories listed at

470 garbage into a loose object, to allow us to create a test data for

471 mechanisms to catch corrupt objects.

472

626 - Will merge to 'next'.

473 + Will merge to 'master'.

474

475

476 * jc/hash-object-fsck-tag (2014-09-12) 2 commits

@@ -635,7 +482,7 @@ of the repositories listed at

482 Using "hash-object --literally", test one of the new breakages

483 js/fsck-tag-validation topic teaches "fsck" to catch is caught.

484

638 - Will merge to 'next'.

485 + Will merge to 'master'.

486

487

488 * js/fsck-tag-validation (2014-09-12) 6 commits

@@ -650,7 +497,7 @@ of the repositories listed at

497

498 Teach "git fsck" to inspect the contents of annotated tag objects.

499

653 - Will merge to 'next'.

500 + Will merge to 'master'.

501

502

503 * mh/lockfile (2014-09-16) 35 commits

@@ -734,7 +581,7 @@ of the repositories listed at

581 Rerolled, reviews in progress; it seems that we will see another reroll?

582

583

737 -* cc/interpret-trailers (2014-09-15) 11 commits

584 +* cc/interpret-trailers (2014-09-22) 11 commits

585 - Documentation: add documentation for 'git interpret-trailers'

586 - trailer: add tests for commands in config file

587 - trailer: execute command from 'trailer.<name>.command'

@@ -750,11 +597,13 @@ of the repositories listed at

597 A new filter to programatically edit the tail end of the commit log

598 messages.

599

753 - Rerolled, with some review comments but not much; it seems that we

754 - will see another reroll?

600 + Discussion on the topic with Michael Tsirkin who wants to utilize

601 + this machinery is going on. Finally a real functionality review

602 + that is very much welcomed ;-).

603

604

757 -* sp/stream-clean-filter (2014-08-28) 6 commits

605 +* sp/stream-clean-filter (2014-09-22) 7 commits

606 + - sha1_file: don't convert off_t to size_t too early to avoid potential die()

607 - convert: stream from fd to required clean filter to reduce used address space

608 - copy_fd(): do not close the input file descriptor

609 - mmap_limit: introduce GIT_MMAP_LIMIT to allow testing expected mmap size

@@ -762,40 +611,41 @@ of the repositories listed at

611 - config.c: add git_env_ulong() to parse environment variable

612 - convert: drop arguments other than 'path' from would_convert_to_git()

613

765 - Rerolled. Comments & reviews?

614 + Will merge to 'next'.

615

616

617 * jc/push-cert (2014-09-17) 23 commits

769 - - signed push: allow stale nonce in stateless mode

770 - - signed push: teach smart-HTTP to pass "git push --signed" around

771 - - signed push: fortify against replay attacks

772 - - signed push: add "pushee" header to push certificate

773 - - signed push: remove duplicated protocol info

774 - - send-pack: send feature request on push-cert packet

775 - - receive-pack: GPG-validate push certificates

776 - - push: the beginning of "git push --signed"

777 - - pack-protocol doc: typofix for PKT-LINE

778 - - gpg-interface: move parse_signature() to where it should be

779 - - gpg-interface: move parse_gpg_output() to where it should be

780 - - send-pack: clarify that cmds_sent is a boolean

781 - - send-pack: refactor inspecting and resetting status and sending commands

782 - - send-pack: rename "new_refs" to "need_pack_data"

783 - - receive-pack: factor out capability string generation

784 - - send-pack: factor out capability string generation

785 - - send-pack: always send capabilities

786 - - send-pack: refactor decision to send update per ref

787 - - send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higher

788 - - receive-pack: factor out queueing of command

789 - - receive-pack: do not reuse old_sha1[] for other things

790 - - receive-pack: parse feature request a bit earlier

791 - - receive-pack: do not overallocate command structure

792 -

793 - Allow "git push" request to be signed, so that it can be verified

618 + (merged to 'next' on 2014-09-24 at a99f5d8)

619 + + signed push: allow stale nonce in stateless mode

620 + + signed push: teach smart-HTTP to pass "git push --signed" around

621 + + signed push: fortify against replay attacks

622 + + signed push: add "pushee" header to push certificate

623 + + signed push: remove duplicated protocol info

624 + + send-pack: send feature request on push-cert packet

625 + + receive-pack: GPG-validate push certificates

626 + + push: the beginning of "git push --signed"

627 + + pack-protocol doc: typofix for PKT-LINE

628 + + gpg-interface: move parse_signature() to where it should be

629 + + gpg-interface: move parse_gpg_output() to where it should be

630 + + send-pack: clarify that cmds_sent is a boolean

631 + + send-pack: refactor inspecting and resetting status and sending commands

632 + + send-pack: rename "new_refs" to "need_pack_data"

633 + + receive-pack: factor out capability string generation

634 + + send-pack: factor out capability string generation

635 + + send-pack: always send capabilities

636 + + send-pack: refactor decision to send update per ref

637 + + send-pack: move REF_STATUS_REJECT_NODELETE logic a bit higher

638 + + receive-pack: factor out queueing of command

639 + + receive-pack: do not reuse old_sha1[] for other things

640 + + receive-pack: parse feature request a bit earlier

641 + + receive-pack: do not overallocate command structure

642 +

643 + Allow "git push" request to be signed, so that it can be verified and

644 audited, using the GPG signature of the person who pushed, that the

645 tips of branches at a public repository really point the commits

646 the pusher wanted to, without having to "trust" the server.

647

798 - Will merge to 'next'.

648 + Will merge to 'master'.

649

650

651 * jc/test-lazy-prereq (2014-06-13) 1 commit

What's cooking (2014/09 #06)