c4517cb977 · matheusbsbs/matheus-bagliano

@@ -1,19 +1,30 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Sep 2014, #04; Thu, 18)

4 -X-master-at: 30d45f798d1a4b14759cd977b68be4476d66ea17

5 -X-next-at: 6f8c9d7a18026a70d5a66a800d0d849658729a92

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

4 +X-master-at: 97b8860c071898d9e162678ea1035a8ced2f8b1f

5 +X-next-at: 7a54a76ab8dddf4a52b3453b206ed4b8f4200891

6

7 -What's cooking in git.git (Sep 2014, #04; Thu, 18)

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

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 -The third batch of topics have graduated to 'master'. There are too

15 -many topics waiting to be in 'next' but without comments and reviews

16 -on the list, which is somewhat disturbing.

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

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

30 of the repositories listed at

@@ -21,99 +32,141 @@ of the repositories listed at

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

33

34 --------------------------------------------------

24 -[New Topics]

35 +[Graduated to "master"]

36

26 -* jk/faster-name-conflicts (2014-09-12) 1 commit

27 - - refs: speed up is_refname_available

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

29 - Optimize the check to see if a ref $F can be created by making sure

30 - no existing ref has $F/ as its prefix, which especially matters in

31 - a repository with a large number of existing refs.

41

33 - Will merge to 'next'.

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

36 -* jk/write-packed-refs-via-stdio (2014-09-10) 1 commit

37 - - refs: write packed_refs file using stdio

48

39 - Optimize the code path to write out the packed-refs file, which

40 - especially matters in a repository with a large number of refs.

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

42 - Will merge to 'next'.

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

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

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

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

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

49 - Will merge to 'master'.

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

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

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

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

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

56 - Will merge to 'master'.

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

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

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

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

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

63 - Will merge to 'master'.

85 + Code clean-up.

86

87

66 -* da/include-compat-util-first-in-c (2014-09-15) 4 commits

67 - - SQUASH???

68 - - check-headers: add header usage checks for .c files

69 - - Makefile: add check-headers target

70 - - cleanups: ensure that git-compat-util.h is included first

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

73 -* da/rev-parse-verify-quiet (2014-09-18) 4 commits

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

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

76 - - t1503: use test_must_be_empty

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

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

80 -* hj/pretty-naked-decoration (2014-09-16) 2 commits

81 - - SQUASH???

82 - - pretty: add %D format specifier

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

106 + exit status in some cases.

107

108

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

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

87 - + Makefile: fix some typos in the preamble

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

89 - Will merge to 'master'.

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

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

93 - - receive-pack: allow hooks to ignore its standard input stream

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

95 - Will merge to 'next'.

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

98 -* jk/close-stderr-of-credential-cache-deamon (2014-09-16) 1 commit

99 - - credential-cache: close stderr in daemon process

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

101 - Will merge to 'next'.

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

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

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

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

107 - Will merge to 'next'.

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

110 -* jk/prune-packed-server-info (2014-09-15) 4 commits

111 - - repack: call prune_packed_objects() and update_server_info() directly

112 - - server-info: clean up after writing info/packs

113 - - make update-server-info more robust

114 - - prune-packed: fix minor memory leak

152

116 - Will merge to 'next'.

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

162 +

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

164 + stream caused it to misbehave.

165 +

166 +

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

@@ -121,50 +174,116 @@ of the repositories listed at

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

175 + rerere.h: mark string for translation

176

124 - Will merge to 'master'.

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

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

128 - - unblock and unignore SIGPIPE

183 + Code clean-up.

184

130 - Will merge to 'next'.

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

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

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

135 - - add macro REALLOC_ARRAY

190 + Code clean-up.

191

137 - Will merge to 'next'.

192 +

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()

197 +

198 + Code clean-up.

199 +

200 +

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()

204 +

205 + Code clean-up.

206 +

207 +

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

211 +

212 + Code clean-up.

213

214

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>

218

144 - Will merge to 'master'.

219 +

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

223

224

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

228

151 - Will merge to 'master'.

229

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

235 +

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

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

238

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

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

239

157 - Will merge to 'next'.

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

243

244

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

161 - - help: fix the size passed to qsort

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

250

163 - Will merge to 'next'.

251 +

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

255

256 --------------------------------------------------

257 [Stalled]

258

259 +* rs/ref-transaction (2014-09-12) 20 commits

260 + . remote rm/prune: print a message when writing packed-refs fails

261 + . ref_transaction_commit: bail out on failure to remove a ref

262 + . lockfile: remove unable_to_lock_error

263 + . refs.c: do not permit err == NULL

264 + . for-each-ref.c: improve message before aborting on broken ref

265 + . refs.c: fix handling of badly named refs

266 + . branch -d: avoid repeated symref resolution

267 + . refs.c: change resolve_ref_unsafe reading argument to be a flags field

268 + . refs.c: make write_ref_sha1 static

269 + . fetch.c: change s_update_ref to use a ref transaction

270 + . refs.c: ref_transaction_commit: distinguish name conflicts from other errors

271 + . refs.c: pass a skip list to name_conflict_fn

272 + . refs.c: call lock_ref_sha1_basic directly from commit

273 + . refs.c: move the check for valid refname to lock_ref_sha1_basic

274 + . rename_ref: don't ask read_ref_full where the ref came from

275 + . refs.c: pass the ref log message to _create/delete/update instead of _commit

276 + . refs.c: add an err argument to delete_ref_loose

277 + . wrapper.c: add a new function unlink_or_msg

278 + . wrapper.c: remove/unlink_or_warn: simplify, treat ENOENT as success

279 + . mv test: recreate mod/ directory instead of relying on stale copy

280 +

281 + Rerolled and was asked to wait. Seems to break HEAD reflog

282 + upon "checkout HEAD^0".

283 +

284 + Expecting another reroll.

285 +

286 +

287 * tr/remerge-diff (2014-09-08) 8 commits

288 - log --remerge-diff: show what the conflict resolution changed

289 - name-hash: allow dir hashing even when !ignore_case

@@ -369,136 +488,169 @@ of the repositories listed at

488 --------------------------------------------------

489 [Cooking]

490

372 -* rs/ref-transaction (2014-09-12) 20 commits

373 - . remote rm/prune: print a message when writing packed-refs fails

374 - . ref_transaction_commit: bail out on failure to remove a ref

375 - . lockfile: remove unable_to_lock_error

376 - . refs.c: do not permit err == NULL

377 - . for-each-ref.c: improve message before aborting on broken ref

378 - . refs.c: fix handling of badly named refs

379 - . branch -d: avoid repeated symref resolution

380 - . refs.c: change resolve_ref_unsafe reading argument to be a flags field

381 - . refs.c: make write_ref_sha1 static

382 - . fetch.c: change s_update_ref to use a ref transaction

383 - . refs.c: ref_transaction_commit: distinguish name conflicts from other errors

384 - . refs.c: pass a skip list to name_conflict_fn

385 - . refs.c: call lock_ref_sha1_basic directly from commit

386 - . refs.c: move the check for valid refname to lock_ref_sha1_basic

387 - . rename_ref: don't ask read_ref_full where the ref came from

388 - . refs.c: pass the ref log message to _create/delete/update instead of _commit

389 - . refs.c: add an err argument to delete_ref_loose

390 - . wrapper.c: add a new function unlink_or_msg

391 - . wrapper.c: remove/unlink_or_warn: simplify, treat ENOENT as success

392 - . mv test: recreate mod/ directory instead of relying on stale copy

491 +* jk/faster-name-conflicts (2014-09-12) 1 commit

492 + (merged to 'next' on 2014-09-19 at 34d2840)

493 + + refs: speed up is_refname_available

494

394 - Rerolled and was asked to wait. Seems to break HEAD reflog

395 - upon "checkout HEAD^0".

495 + Optimize the check to see if a ref $F can be created by making sure

496 + no existing ref has $F/ as its prefix, which especially matters in

497 + a repository with a large number of existing refs.

498

397 - Expecting another reroll.

499 + Will merge to 'master'.

500

501

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

401 - - hash-object: add --literally option

402 - - hash-object: pass 'write_object' as a flag

403 - - hash-object: reduce file-scope statics

404 - (this branch is used by jc/hash-object-fsck-tag.)

502 +* jk/write-packed-refs-via-stdio (2014-09-10) 1 commit

503 + (merged to 'next' on 2014-09-19 at f1e94fb)

504 + + refs: write packed_refs file using stdio

505

406 - "hash-object" learned a new "--literally" option to hash any random

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

408 - mechanisms to catch corrupt objects.

506 + Optimize the code path to write out the packed-refs file, which

507 + especially matters in a repository with a large number of refs.

508

410 - Will merge to 'next'.

509 + Will merge to 'master'.

510

511

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

414 - - t1450: make sure fsck detects a malformed tagger line

415 - - Merge branch 'js/fsck-tag-validation' into HEAD

416 - (this branch uses jc/hash-object and js/fsck-tag-validation.)

512 +* da/include-compat-util-first-in-c (2014-09-15) 4 commits

513 + - SQUASH???

514 + - check-headers: add header usage checks for .c files

515 + - Makefile: add check-headers target

516 + - cleanups: ensure that git-compat-util.h is included first

517

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

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

518 +

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

524 +

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

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

527 + gave error messages in some cases.

528

529 Will merge to 'next'.

530

531

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

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

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

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

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

533 + - pretty: add %D format specifier

534 +

535 + Will merge to 'next'.

536

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

430 - exit status in some cases.

537 +

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

539 + (merged to 'next' on 2014-09-19 at 7abf293)

540 + + receive-pack: allow hooks to ignore its standard input stream

541 +

542 + pre- and post-receive hooks are no longer required to read all

543 + their inputs.

544

545 Will merge to 'master'.

546

547

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

436 - - Make sure that index-pack --strict checks tag objects

437 - - Add regression tests for stricter tag fsck'ing

438 - - fsck: check tag objects' headers

439 - - Make sure fsck_commit_buffer() does not run out of the buffer

440 - - fsck_object(): allow passing object data separately from the object itself

441 - - Refactor type_from_string() to allow continuing after detecting an error

442 - (this branch is used by jc/hash-object-fsck-tag.)

548 +* jk/close-stderr-of-credential-cache-deamon (2014-09-16) 1 commit

549 + (merged to 'next' on 2014-09-19 at 51ba3be)

550 + + credential-cache: close stderr in daemon process

551

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

552 + Plug fd leaks.

553

446 - Will merge to 'next'.

554 + Will merge to 'master'.

555

556

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

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

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

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

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

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

560

453 - Code clean-up.

561 + Some MUAs mangled a line in a message that begins with "From " to

562 + ">From " when writing to a mailbox file and feeding such an input

563 + to "git am" used to lose such a line.

564

565 Will merge to 'master'.

566

567

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

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

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

568 +* jk/prune-packed-server-info (2014-09-15) 4 commits

569 + (merged to 'next' on 2014-09-19 at 5e6c398)

570 + + repack: call prune_packed_objects() and update_server_info() directly

571 + + server-info: clean up after writing info/packs

572 + + make update-server-info more robust

573 + + prune-packed: fix minor memory leak

574 +

575 + Code cleanup.

576

577 Will merge to 'master'.

578

579

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

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

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

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

581 + - unblock and unignore SIGPIPE

582

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

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

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

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

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

586

472 - Will merge to 'master'.

587 + Will merge to 'next'.

588

589

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

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

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

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

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

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

592 + - add macro REALLOC_ARRAY

593

480 - Code clean-up.

594 + Code cleanup.

595

482 - Will merge to 'master'.

596 + Will merge to 'next'.

597

598

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

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

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

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

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

601

489 - Compilation fix for some compilers.

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

603

491 - Will merge to 'master'.

604 + Will merge to 'next'.

605

606

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

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

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

497 - + strbuf: export strbuf_addchars()

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

608 + - help: fix the size passed to qsort

609

499 - Code clean-up.

610 + Code cleanup.

611

501 - Will merge to 'master'.

612 + Will merge to 'next'.

613 +

614 +

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

616 + (merged to 'next' on 2014-09-19 at ea6ac62)

617 + + hash-object: add --literally option

618 + + hash-object: pass 'write_object' as a flag

619 + + hash-object: reduce file-scope statics

620 + (this branch is used by jc/hash-object-fsck-tag.)

621 +

622 + "hash-object" learned a new "--literally" option to hash any random

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

624 + mechanisms to catch corrupt objects.

625 +

626 + Will merge to 'next'.

627 +

628 +

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

630 + (merged to 'next' on 2014-09-19 at f14a7fe)

631 + + t1450: make sure fsck detects a malformed tagger line

632 + + Merge branch 'js/fsck-tag-validation' into HEAD

633 + (this branch uses jc/hash-object and js/fsck-tag-validation.)

634 +

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

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

637 +

638 + Will merge to 'next'.

639 +

640 +

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

642 + (merged to 'next' on 2014-09-19 at 4a62182)

643 + + Make sure that index-pack --strict checks tag objects

644 + + Add regression tests for stricter tag fsck'ing

645 + + fsck: check tag objects' headers

646 + + Make sure fsck_commit_buffer() does not run out of the buffer

647 + + fsck_object(): allow passing object data separately from the object itself

648 + + Refactor type_from_string() to allow continuing after detecting an error

649 + (this branch is used by jc/hash-object-fsck-tag.)

650 +

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

652 +

653 + Will merge to 'next'.

654

655

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

@@ -602,170 +754,6 @@ of the repositories listed at

754 will see another reroll?

755

756

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

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

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

608 -

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

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

611 - datetime output that is more strictly conformant.

612 -

613 - Will merge to 'master'.

614 -

615 -

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

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

618 - + determine_author_info(): copy getenv output

619 - + determine_author_info(): reuse parsing functions

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

621 - + record_author_date(): use find_commit_header()

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

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

624 -

625 - Code clean-up.

626 -

627 - Will merge to 'master'.

628 -

629 -

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

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

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

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

634 -

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

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

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

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

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

640 -

641 - Will merge to 'master'.

642 -

643 -

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

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

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

647 -

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

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

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

651 - larger change.

652 -

653 - Will merge to 'master'.

654 -

655 -

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

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

658 - + send-pack: take refspecs over stdin

659 -

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

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

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

663 -

664 - Will merge to 'master'.

665 -

666 -

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

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

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

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

671 -

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

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

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

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

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

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

678 -

679 - Will merge to 'master'.

680 -

681 -

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

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

684 - + contrib/svn-fe: fix Makefile

685 -

686 - Will merge to 'master'.

687 -

688 -

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

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

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

692 - + t9300: test filedelete command

693 -

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

695 - stream caused it to misbehave.

696 -

697 - Will merge to 'master'.

698 -

699 -

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

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

702 - + grammofix in user-facing messages

703 -

704 - Will merge to 'master'.

705 -

706 -

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

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

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

710 -

711 - Will merge to 'master'.

712 -

713 -

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

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

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

717 -

718 - Will merge to 'master'.

719 -

720 -

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

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

723 - + merge-tree: remove unused df_conflict arguments

724 -

725 - Code clean-up.

726 -

727 - Will merge to 'master'.

728 -

729 -

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

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

732 - + config: simplify git_config_include()

733 -

734 - Code clean-up.

735 -

736 - Will merge to 'master'.

737 -

738 -

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

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

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

742 -

743 - Code clean-up.

744 -

745 - Will merge to 'master'.

746 -

747 -

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

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

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

751 - + Makefile: propagate NATIVE_CRLF to C

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

753 -

754 - Will merge to 'master'.

755 -

756 -

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

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

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

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

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

762 -

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

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

765 -

766 - Will merge to 'master'.

767 -

768 -

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

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

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

@@ -807,7 +795,7 @@ of the repositories listed at

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

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

797

810 - Will start merging early bits to 'next'.

798 + Will merge to 'next'.

799

800

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

@@ -815,8 +803,7 @@ of the repositories listed at

803

804 Test-script clean-up.

805

818 - Comments & reviews?

819 - Otherwise will merge to 'next'.

806 + Will merge to 'next'.

807

808

809 * mt/patch-id-stable (2014-06-10) 1 commit

@@ -830,13 +817,3 @@ of the repositories listed at

817 Nobody seems to be jumping up & down requesting this last step,

818 which makes the result somewhat backward incompatible.

819 Will perhaps drop.

833 -

834 ---------------------------------------------------

835 -[Discarded]

836 -

837 -* rs/ref-transaction-multi (2014-09-03) 7 commits

838 -* rs/ref-transaction-rename (2014-09-03) 6 commits

839 -* rs/ref-transaction-reflog (2014-09-03) 29 commits

840 -

841 - It appears that rs/ref-transaction series is being rerolled, so

842 - these will be rerolled as well.

What's cooking (2014/09 #05)