129bda6aa3 · matheusbsbs/matheus-bagliano

@@ -1,9 +1,9 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Sep 2011, #05; Wed, 14)

3 -X-master-at: 1e5814f3def08452aef4caa703f074ba7d167867

4 -X-next-at: 872ee2d61fac3d9dd13d38dcf7d86c7059b4ca79

2 +Subject: What's cooking in git.git (Sep 2011, #06; Wed, 21)

3 +X-master-at: 5ec8217eb6c89974fda94808a310aa651577b25d

4 +X-next-at: f316dec93e8cd645d8185a80b972857985dc33a4

5

6 -What's cooking in git.git (Sep 2011, #05; Wed, 14)

6 +What's cooking in git.git (Sep 2011, #06; Wed, 21)

7 --------------------------------------------------

8

9 Here are the topics that have been cooking. Commits prefixed with '-' are

@@ -28,49 +28,100 @@ With all the topics and integration branches:

28 --------------------------------------------------

29 [New Topics]

30

31 -* jk/maint-fetch-submodule-check-fix (2011-09-12) 1 commit

32 - (merged to 'next' on 2011-09-12 at 3c73b8c)

33 - + fetch: avoid quadratic loop checking for updated submodules

34 - (this branch is used by jk/argv-array.)

35 -

36 -* bc/attr-ignore-case (2011-09-14) 5 commits

37 - - attr: read core.attributesfile from git_default_core_config

38 - - attr.c: respect core.ignorecase when matching attribute patterns

39 - - builtin/mv.c: plug miniscule memory leak

40 - - cleanup: use internal memory allocation wrapper functions everywhere

41 - - attr.c: avoid inappropriate access to strbuf "buf" member

42 -

43 -* jc/maint-fsck-fwrite-size-check (2011-09-11) 1 commit

44 - - fsck: do not abort upon finding an empty blob

31 +* bw/grep-no-index-no-exclude (2011-09-15) 2 commits

32 + - grep --no-index: don't use git standard exclusions

33 + - grep: do not use --index in the short usage output

34 +

35 +* jc/namespace-doc-with-old-asciidoc (2011-09-16) 1 commit

36 + - Documentation/gitnamespaces.txt: cater to older asciidoc

37 +

38 +* jc/want-commit (2011-09-15) 1 commit

39 + - Allow git merge ":/<pattern>"

40 +

41 +* jc/ls-remote-short-help (2011-09-16) 1 commit

42 + - ls-remote: a lone "-h" is asking for help

43 +

44 +* jc/maint-bundle-too-quiet (2011-09-19) 1 commit

45 + - Teach progress eye-candy to fetch_refs_from_bundle()

46 +

47 +* jk/filter-branch-require-clean-work-tree (2011-09-15) 1 commit

48 + - filter-branch: use require_clean_work_tree

49 +

50 +* jn/gitweb-highlite-sanitise (2011-09-16) 1 commit

51 + - gitweb: Strip non-printable characters from syntax highlighter output

52 +

53 +* mh/check-ref-format-3 (2011-09-16) 22 commits

54 + - add_ref(): verify that the refname is formatted correctly

55 + - resolve_ref(): expand documentation

56 + - resolve_ref(): also treat a too-long SHA1 as invalid

57 + - resolve_ref(): emit warnings for improperly-formatted references

58 + - resolve_ref(): verify that the input refname has the right format

59 + - remote: avoid passing NULL to read_ref()

60 + - remote: use xstrdup() instead of strdup()

61 + - resolve_ref(): do not follow incorrectly-formatted symbolic refs

62 + - resolve_ref(): extract a function get_packed_ref()

63 + - resolve_ref(): turn buffer into a proper string as soon as possible

64 + - resolve_ref(): only follow a symlink that contains a valid, normalized refname

65 + - resolve_ref(): use prefixcmp()

66 + - resolve_ref(): explicitly fail if a symlink is not readable

67 + - Change check_refname_format() to reject unnormalized refnames

68 + - Inline function refname_format_print()

69 + - Make collapse_slashes() allocate memory for its result

70 + - Do not allow ".lock" at the end of any refname component

71 + - Refactor check_refname_format()

72 + - Change check_ref_format() to take a flags argument

73 + - Change bad_ref_char() to return a boolean value

74 + - git check-ref-format: add options --allow-onelevel and --refspec-pattern

75 + - t1402: add some more tests

76

46 -* jc/request-pull-show-head-2 (2011-09-13) 2 commits

47 - - request-pull: state exact commit object name

48 - - fetch: allow asking for an explicit commit object by name

77 +* cn/eradicate-working-copy (2011-09-21) 2 commits

78 + - patch-id.c: use strbuf instead of a fixed buffer

79 + - Remove 'working copy' from the documentation and C code

80 +

81 +* js/bisect-no-checkout (2011-09-21) 1 commit

82 + (merged to 'next' on 2011-09-21 at e94ad3e)

83 + + bisect: fix exiting when checkout failed in bisect_start()

84 +

85 +* mg/maint-doc-sparse-checkout (2011-09-21) 3 commits

86 + (merged to 'next' on 2011-09-21 at f316dec)

87 + + git-read-tree.txt: correct sparse-checkout and skip-worktree description

88 + + git-read-tree.txt: language and typography fixes

89 + + unpack-trees: print "Aborting" to stderr

90 +

91 +* ms/patch-id-with-overlong-line (2011-09-21) 1 commit

92 + - patch-id.c: use strbuf instead of a fixed buffer

93 +

94 +* sn/doc-update-index-assume-unchanged (2011-09-21) 1 commit

95 + (merged to 'next' on 2011-09-21 at 325e796)

96 + + Documentation/git-update-index: refer to 'ls-files'

97 +

98 +* jc/request-pull-show-head-4 (2011-09-21) 7 commits

99 + - request-pull: use the branch description

100 + - request-pull: state what commit to expect

101 + - request-pull: modernize style

102 + - branch: teach --edit-description option

103 + - format-patch: use branch description in cover letter

104 + - branch: add read_branch_desc() helper function

105 + - Merge branch 'bk/ancestry-path' into jc/branch-desc

106 + (this branch uses bk/ancestry-path.)

107

50 -* jk/argv-array (2011-09-14) 7 commits

51 - - run_hook: use argv_array API

52 - - checkout: use argv_array API

53 - - bisect: use argv_array API

54 - - quote: provide sq_dequote_to_argv_array

55 - - refactor argv_array into generic code

56 - - quote.h: fix bogus comment

57 - - add sha1_array API docs

58 - (this branch uses jk/maint-fetch-submodule-check-fix.)

108 +--------------------------------------------------

109 +[Graduated to "master"]

110

60 -* js/cred-macos-x-keychain-2 (2011-09-14) 1 commit

61 - - contrib: add a pair of credential helpers for Mac OS X's keychain

62 - (this branch uses jk/http-auth-keyring; is tangled with js/cred-macos-x-keychain.)

111 +* ph/format-patch-no-color (2011-09-12) 1 commit

112 + (merged to 'next' on 2011-09-12 at 20283e8)

113 + + format-patch: ignore ui.color

114

64 -Welcome addition to build our confidence in the jk/http-auth-keyring topic.

115 +A fix for the recent regression.

116

117 --------------------------------------------------

118 [Stalled]

119

120 * jc/signed-push (2011-09-12) 7 commits

70 - . push -s: support pre-receive-signature hook

71 - . push -s: receiving end

72 - . push -s: send signed push certificate

73 - . push -s: skeleton

121 + - push -s: support pre-receive-signature hook

122 + - push -s: receiving end

123 + - push -s: send signed push certificate

124 + - push -s: skeleton

125 - Split GPG interface into its own helper library

126 - rename "match_refs()" to "match_push_refs()"

127 - send-pack: typofix error message

@@ -79,7 +130,7 @@ Welcome addition to build our confidence in the jk/http-auth-keyring topic.

130 This was the v2 that updated notes tree on the receiving end.

131

132 * jc/signed-push-3 (2011-09-12) 4 commits

82 - - push -s: signed push

133 + . push -s: signed push

134 - Split GPG interface into its own helper library

135 - rename "match_refs()" to "match_push_refs()"

136 - send-pack: typofix error message

@@ -88,14 +139,6 @@ This was the v2 that updated notes tree on the receiving end.

139 This is the third edition, that moves the preparation of the notes tree to

140 the sending end.

141

91 -* nd/maint-autofix-tag-in-head (2011-08-26) 3 commits

92 - - Accept tags in HEAD or MERGE_HEAD

93 - - merge: remove global variable head[]

94 - - merge: keep stash[] a local variable

95 -

96 -Probably needs a re-roll to aim a bit higher.

97 -Not urgent; will not be in 1.7.7.

98 -

142 * jk/add-i-hunk-filter (2011-07-27) 5 commits

143 (merged to 'next' on 2011-08-11 at 8ff9a56)

144 + add--interactive: add option to autosplit hunks

@@ -120,13 +163,6 @@ Will be dropped.

163

164 Would need another round to separate per-pack and per-session limits.

165

123 -* jm/mergetool-pathspec (2011-06-22) 2 commits

124 - - mergetool: Don't assume paths are unmerged

125 - - mergetool: Add tests for filename with whitespace

126 -

127 -I think this is a good idea, but it probably needs a re-roll.

128 -Cf. $gmane/176254 and 176255.

129 -

166 * jk/generation-numbers (2011-09-11) 8 commits

167 - metadata-cache.c: make two functions static

168 - limit "contains" traversals based on commit generation

@@ -157,11 +193,58 @@ also loses the ability to escape glob specials. Perhaps drop?

193 --------------------------------------------------

194 [Cooking]

195

160 -* rj/maint-t9159-svn-rev-notation (2011-09-13) 1 commit

161 - - t9159-*.sh: t9159-*.sh: skip for mergeinfo test for svn <= 1.4

196 +* jm/mergetool-pathspec (2011-09-16) 2 commits

197 + - mergetool: no longer need to save standard input

198 + - mergetool: Use args as pathspec to unmerged files

199 +

200 +* nd/maint-autofix-tag-in-head (2011-09-18) 4 commits

201 + - Accept tags in HEAD or MERGE_HEAD

202 + - merge: remove global variable head[]

203 + - merge: use return value of resolve_ref() to determine if HEAD is invalid

204 + - merge: keep stash[] a local variable

205 +

206 +* jk/maint-fetch-submodule-check-fix (2011-09-12) 1 commit

207 + (merged to 'next' on 2011-09-12 at 3c73b8c)

208 + + fetch: avoid quadratic loop checking for updated submodules

209 + (this branch is used by jk/argv-array.)

210 +

211 +This probably can wait, as long as the other half of the regression fix

212 +is in the upcoming release.

213 +

214 +* bc/attr-ignore-case (2011-09-14) 5 commits

215 + - attr: read core.attributesfile from git_default_core_config

216 + - attr.c: respect core.ignorecase when matching attribute patterns

217 + - builtin/mv.c: plug miniscule memory leak

218 + - cleanup: use internal memory allocation wrapper functions everywhere

219 + - attr.c: avoid inappropriate access to strbuf "buf" member

220 +

221 +* jc/maint-fsck-fwrite-size-check (2011-09-11) 1 commit

222 + (merged to 'next' on 2011-09-16 at 2258f11)

223 + + fsck: do not abort upon finding an empty blob

224 +

225 +* jk/argv-array (2011-09-14) 7 commits

226 + (merged to 'next' on 2011-09-16 at 90feab4)

227 + + run_hook: use argv_array API

228 + + checkout: use argv_array API

229 + + bisect: use argv_array API

230 + + quote: provide sq_dequote_to_argv_array

231 + + refactor argv_array into generic code

232 + + quote.h: fix bogus comment

233 + + add sha1_array API docs

234 + (this branch uses jk/maint-fetch-submodule-check-fix.)

235 +

236 +* js/cred-macos-x-keychain-2 (2011-09-14) 1 commit

237 + - contrib: add a pair of credential helpers for Mac OS X's keychain

238 + (this branch is tangled with jk/http-auth-keyring.)

239 +

240 +Welcome addition to build our confidence in the jk/http-auth-keyring topic.

241 +

242 +* rj/maint-t9159-svn-rev-notation (2011-09-21) 1 commit

243 + - t9159-*.sh: skip for mergeinfo test for svn <= 1.4

244

245 * tr/doc-note-rewrite (2011-09-13) 1 commit

164 - - Documentation: basic configuration of notes.rewriteRef

246 + (merged to 'next' on 2011-09-16 at 5fe813a)

247 + + Documentation: basic configuration of notes.rewriteRef

248

249 Updated to a safer wording.

250

@@ -170,13 +253,6 @@ Updated to a safer wording.

253

254 Will be re-rolled after 1.7.7 final.

255

173 -* ph/format-patch-no-color (2011-09-12) 1 commit

174 - (merged to 'next' on 2011-09-12 at 20283e8)

175 - + format-patch: ignore ui.color

176 -

177 -This fix for the recent regression probably should be in 1.7.7 final.

178 -Will merge to "master" soonish.

179 -

256 * hl/iso8601-more-zone-formats (2011-09-12) 1 commit

257 (merged to 'next' on 2011-09-12 at 270f5c7)

258 + date.c: Support iso8601 timezone formats

@@ -189,28 +265,25 @@ Will merge to "master" soonish.

265 Just to make it easier to run a hook that reads from its standard input.

266

267 * jk/for-each-ref (2011-09-08) 5 commits

192 - - for-each-ref: add split message parts to %(contents:*).

193 - - for-each-ref: handle multiline subjects like --pretty

194 - - for-each-ref: refactor subject and body placeholder parsing

195 - - t6300: add more body-parsing tests

196 - - t7004: factor out gpg setup

197 -

198 -Will merge to "next".

268 + (merged to 'next' on 2011-09-14 at 36ed515)

269 + + for-each-ref: add split message parts to %(contents:*).

270 + + for-each-ref: handle multiline subjects like --pretty

271 + + for-each-ref: refactor subject and body placeholder parsing

272 + + t6300: add more body-parsing tests

273 + + t7004: factor out gpg setup

274

275 * wh/normalize-alt-odb-path (2011-09-07) 1 commit

201 - - sha1_file: normalize alt_odb path before comparing and storing

202 -

203 -Will merge to "next".

276 + (merged to 'next' on 2011-09-14 at 96f722b)

277 + + sha1_file: normalize alt_odb path before comparing and storing

278

279 * fk/use-kwset-pickaxe-grep-f (2011-09-11) 2 commits

206 - - obstack.c: Fix some sparse warnings

207 - - sparse: Fix an "Using plain integer as NULL pointer" warning

280 + (merged to 'next' on 2011-09-14 at 436d858)

281 + + obstack.c: Fix some sparse warnings

282 + + sparse: Fix an "Using plain integer as NULL pointer" warning

283

284 In general we would prefer to see these fixed at the upstream first, but

285 we have essentially forked from them at their last GPLv2 versions...

286

212 -Will merge to "next".

213 -

287 * jc/make-static (2011-09-14) 4 commits

288 (merged to 'next' on 2011-09-14 at c5943ff)

289 + exec_cmd.c: prepare_git_cmd() is sometimes used

@@ -220,24 +293,12 @@ Will merge to "next".

293 + make-static: master

294 (this branch is tangled with jc/reflog-walk-use-only-nsha1.)

295

223 -With a few fix-ups.

296 +With a few fix-ups; probably needs to be ejected after 1.7.7 happens.

297

298 * rj/quietly-create-dep-dir (2011-09-11) 1 commit

299 (merged to 'next' on 2011-09-12 at 93d1c6b)

300 + Makefile: Make dependency directory creation less noisy

301

229 -* mh/check-ref-format (2011-09-11) 8 commits

230 - - Add tools to avoid the use of unnormalized refnames.

231 - - Do not allow ".lock" at the end of any refname component

232 - - Add a library function normalize_refname()

233 - - Change check_ref_format() to take a flags argument

234 - - fixup asciidoc formatting

235 - - git check-ref-format: add options --allow-onelevel and --refspec-pattern

236 - - Change bad_ref_char() to return a boolean value

237 - - t1402: add some more tests

238 -

239 -Another reroll coming.

240 -

302 * mz/remote-rename (2011-09-11) 4 commits

303 - remote: only update remote-tracking branch if updating refspec

304 - remote rename: warn when refspec was not updated

@@ -245,20 +306,18 @@ Another reroll coming.

306 - remote: write correct fetch spec when renaming remote 'remote'

307

308 * cb/common-prefix-unification (2011-09-12) 3 commits

248 - - rename pathspec_prefix() to common_prefix() and move to dir.[ch]

249 - - consolidate pathspec_prefix and common_prefix

250 - - remove prefix argument from pathspec_prefix

251 -

252 -Will merge to "next".

309 + (merged to 'next' on 2011-09-14 at 24f571f)

310 + + rename pathspec_prefix() to common_prefix() and move to dir.[ch]

311 + + consolidate pathspec_prefix and common_prefix

312 + + remove prefix argument from pathspec_prefix

313

314 * cb/send-email-help (2011-09-12) 1 commit

255 - - send-email: add option -h

315 + (merged to 'next' on 2011-09-14 at ae71999)

316 + + send-email: add option -h

317

318 A separate set of patches to remove the hidden fully-spelled "help" from

319 other commands would be nice to have as companion patches as well.

320

260 -Will merge to "next".

261 -

321 * jc/fetch-pack-fsck-objects (2011-09-04) 3 commits

322 (merged to 'next' on 2011-09-12 at a031347)

323 + test: fetch/receive with fsckobjects

@@ -299,11 +358,14 @@ objects contained in the packstream, and this adds such a check.

358 + http: avoid empty error messages for some curl errors

359 + http: remove extra newline in error message

360

302 -* bk/ancestry-path (2011-08-25) 3 commits

361 +* bk/ancestry-path (2011-09-15) 4 commits

362 + (merged to 'next' on 2011-09-15 at aa64d04)

363 + + t6019: avoid refname collision on case-insensitive systems

364 (merged to 'next' on 2011-09-02 at d05ba5d)

365 + revision: do not include sibling history in --ancestry-path output

366 + revision: keep track of the end-user input from the command line

367 + rev-list: Demonstrate breakage with --ancestry-path --all

368 + (this branch is used by jc/request-pull-show-head-4.)

369

370 * mg/branch-list (2011-09-13) 7 commits

371 (merged to 'next' on 2011-09-14 at 6610a2e)

@@ -434,7 +496,10 @@ I do not think there is anything fundamentally wrong with this series, but

496 the risk of breakage outweighs any benefit for having this new

497 feature. Will keep it in 'next' at least for one cycle.

498

437 -* jk/http-auth-keyring (2011-09-14) 19 commits

499 +* jk/http-auth-keyring (2011-09-16) 21 commits

500 + (merged to 'next' on 2011-09-16 at b4195eb)

501 + + check_expirations: don't copy over same element

502 + + t0300: add missing EOF terminator for <<

503 (merged to 'next' on 2011-09-14 at 589c7c9)

504 + credential-store: use a better storage format

505 + t0300: make alternate username tests more robust

@@ -457,7 +522,7 @@ feature. Will keep it in 'next' at least for one cycle.

522 + remote-curl: don't retry auth failures with dumb protocol

523 + improve httpd auth tests

524 + url: decode buffers that are not NUL-terminated

460 - (this branch is used by js/cred-macos-x-keychain-2; is tangled with js/cred-macos-x-keychain.)

525 + (this branch is tangled with js/cred-macos-x-keychain and js/cred-macos-x-keychain-2.)

526

527 * rr/revert-cherry-pick-continue (2011-09-11) 19 commits

528 (merged to 'next' on 2011-09-11 at 7d78054)

@@ -485,6 +550,18 @@ feature. Will keep it in 'next' at least for one cycle.

550 --------------------------------------------------

551 [Discarded]

552

553 +* mh/check-ref-format (2011-09-11) 8 commits

554 + . Add tools to avoid the use of unnormalized refnames.

555 + . Do not allow ".lock" at the end of any refname component

556 + . Add a library function normalize_refname()

557 + . Change check_ref_format() to take a flags argument

558 + . fixup asciidoc formatting

559 + . git check-ref-format: add options --allow-onelevel and --refspec-pattern

560 + . Change bad_ref_char() to return a boolean value

561 + . t1402: add some more tests

562 +

563 +Rerolled

564 +

565 * jk/pager-with-alias (2011-08-19) 1 commit

566 . support pager.* for aliases

567

@@ -527,6 +604,15 @@ Reverted out of 'next'.

604 + make-static: master

605 (this branch is tangled with jc/make-static.)

606

607 +* hw/maint-abspath-cwd-limit (2011-09-21) 3 commits

608 + (merged to 'next' on 2011-09-21 at 210cf9a)

609 + + Revert 622fea4 (abspath.c: increase array size of cwd variable)

610 + (merged to 'next' on 2011-09-19 at 7d5e921)

611 + + abspath.c: increase array size of cwd variable to PATH_MAX

612 + + path.c: increase array size of cwd variable to PATH_MAX

613 +

614 +Reverted out of 'next'.

615 +

616 * jc/request-pull-show-head (2011-09-13) 2 commits

617 (merged to 'next' on 2011-09-13 at c82fb3a)

618 + Revert "State what commit to expect in request-pull"

What's cooking (2011/09 #06)