19f396b271 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Sep 2011, #07; Fri, 23)

3 -X-master-at: 85e9c7e1d42849c5c3084a9da748608468310c0e

4 -X-next-at: 6bcf0e2b7ff196fa238fc8d8e9e9e116e0a55e25

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

3 +X-master-at: 8d714b11df2b65e5f4272c1616e561930010be90

4 +X-next-at: 65ce6c2cbd3bace125ad01daf7ec705f2a84e58e

5

6 -What's cooking in git.git (Sep 2011, #07; Fri, 23)

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

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

8

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

10 only in 'pu' while commits prefixed with '+' are in 'next'.

11

12 -We are at 1.7.7-rc3 as of today; I had to make a quick fix for a recent

13 -regression directly on master, and I would like to cook it for a few days,

14 -so the final has to wait til mid next week.

15 -

12 Here are the repositories that have my integration branches:

13

14 With maint, master, next, pu, todo, html and man:

@@ -33,36 +29,76 @@ Until kernel.org comes back to life, it might be a good idea to

29 tentatively have the following in your $HOME/.gitconfig:

30

31 [url "http://code.google.com/p/git-core"]

36 - insteadOf = git://git.kernel.org/pub/scm/git/git.git

32 + insteadOf = git://git.kernel.org/pub/scm/git/git.git

33

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

35 [New Topics]

36

41 -* jc/maint-diffstat-numstat-context (2011-09-22) 1 commit

42 - - diff: teach --stat/--numstat to honor -U$num

37 +* jc/apply-blank-at-eof-fix (2011-09-26) 1 commit

38 + - apply --whitespace=error: correctly report new blank lines at end

39

44 -* nd/maint-sparse-errors (2011-09-22) 2 commits

45 - - Add explanation why we do not allow to sparse checkout to empty working tree

46 - - sparse checkout: show error messages when worktree shaping fails

40 +* nd/sparse-doc (2011-09-26) 1 commit

41 + - git-read-tree.txt: update sparse checkout examples

42

48 -* rs/diff-cleanup-records-fix (2011-09-22) 1 commit

49 - - Revert a part of rc/diff-cleanup-records

43 +* jp/get-ref-dir-unsorted (2011-09-26) 1 commit

44 + - Don't sort ref_list too early

45

51 -It seems that the differences (the reverse of) this patch introduces are

52 -of harmless kind but not very well explained in the original series. We

53 -would need to try harder to write our log messages better next time.

46 +* jc/grep-untracked-exclude (2011-09-28) 2 commits

47 + - Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude

48 + - Merge branch 'jc/maint-grep-untracked-exclude' into jc/grep-untracked-exclude

49 + (this branch uses bw/grep-no-index-no-exclude and jc/maint-grep-untracked-exclude.)

50

55 -* di/fast-import-empty-tag-note-fix (2011-09-22) 2 commits

56 - - fast-import: don't allow to note on empty branch

57 - - fast-import: don't allow to tag empty branch

51 +* jc/maint-grep-untracked-exclude (2011-09-28) 3 commits

52 + - grep: rename --exclude to --exclude-standard

53 + - grep: --untracked and --exclude tests

54 + - grep: teach --untracked and --exclude options

55 + (this branch is used by jc/grep-untracked-exclude; uses bw/grep-no-index-no-exclude.)

56

59 -* js/check-attr-cached (2011-09-22) 2 commits

60 - - t0003: remove extra whitespaces

61 - - Teach '--cached' option to check-attr

57 +* jc/parse-options-boolean (2011-09-28) 5 commits

58 + - apply: use OPT_NOOP_NOARG

59 + - revert: use OPT_NOOP_NOARG

60 + - parseopt: add OPT_NOOP_NOARG

61 + - archive.c: use OPT_BOOL()

62 + - parse-options: deprecate OPT_BOOLEAN

63 +

64 +* mh/maint-notes-merge-pathbuf-fix (2011-09-27) 1 commit

65 + - notes_merge_commit(): do not pass temporary buffer to other function

66 +

67 +* ph/push-to-delete-nothing (2011-09-28) 2 commits

68 + - fixup

69 + - receive-pack: don't pass non-existent refs to post-{receive,update} hooks in push deletions

70 +

71 +* ps/gitweb-js-with-lineno (2011-09-27) 1 commit

72 + - gitweb: Fix links to lines in blobs when javascript-actions are enabled

73 +

74 +* zj/send-email-authen-sasl (2011-09-28) 1 commit

75 + - send-email: auth plain/login fix

76 +

77 +--------------------------------------------------

78 +[Graduated to "master"]

79 +

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

81 + + Documentation/gitnamespaces.txt: cater to older asciidoc

82 +

83 +It turns out that the version of AsciiDoc that has troubles with the

84 +mark-up this patch works around is not quite old enough to be dismissed

85 +as irrelevant.

86

87 --------------------------------------------------

88 [Stalled]

89

90 +* hv/submodule-merge-search (2011-08-26) 5 commits

91 + - submodule: Search for merges only at end of recursive merge

92 + - allow multiple calls to submodule merge search for the same path

93 + - submodule: Demonstrate known breakage during recursive merge

94 + - push: Don't push a repository with unpushed submodules

95 + (merged to 'next' on 2011-08-24 at 398e764)

96 + + push: teach --recurse-submodules the on-demand option

97 + (this branch is tangled with fg/submodule-auto-push.)

98 +

99 +The second from the bottom one needs to be replaced with a properly

100 +written commit log message.

101 +

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

103 - push -s: support pre-receive-signature hook

104 - push -s: receiving end

@@ -85,6 +121,8 @@ This was the v2 that updated notes tree on the receiving end.

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

122 the sending end.

123

124 +I expect that both of these topics will be discarded.

125 +

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

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

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

@@ -139,27 +177,59 @@ also loses the ability to escape glob specials. Perhaps drop?

177 --------------------------------------------------

178 [Cooking]

179

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

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

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

180 +* jc/maint-diffstat-numstat-context (2011-09-22) 1 commit

181 + (merged to 'next' on 2011-09-26 at 12539ab)

182 + + diff: teach --stat/--numstat to honor -U$num

183

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

147 - - Documentation/gitnamespaces.txt: cater to older asciidoc

184 +"diff" is allowed to match the common lines differently depending on how

185 +many context lines it is showing, so running --(num)stat with 0 lines of

186 +context internally gives a result that may be surprising to some people.

187 +

188 +* nd/maint-sparse-errors (2011-09-22) 2 commits

189 + (merged to 'next' on 2011-09-26 at cdcdec5)

190 + + Add explanation why we do not allow to sparse checkout to empty working tree

191 + + sparse checkout: show error messages when worktree shaping fails

192 +

193 +* rs/diff-cleanup-records-fix (2011-09-26) 1 commit

194 + (merged to 'next' on 2011-09-27 at 3bd75d8)

195 + + Revert removal of multi-match discard heuristic in 27af01

196 +

197 +* di/fast-import-empty-tag-note-fix (2011-09-22) 2 commits

198 + - fast-import: don't allow to note on empty branch

199 + - fast-import: don't allow to tag empty branch

200 +

201 +Looked reasonable.

202 +

203 +* js/check-attr-cached (2011-09-22) 2 commits

204 + (merged to 'next' on 2011-09-27 at 74d7b66)

205 + + t0003: remove extra whitespaces

206 + + Teach '--cached' option to check-attr

207 +

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

209 + (merged to 'next' on 2011-09-26 at 776f13b)

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

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

212 + (this branch is used by jc/grep-untracked-exclude and jc/maint-grep-untracked-exclude.)

213

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

150 - - Allow git merge ":/<pattern>"

215 + (merged to 'next' on 2011-09-26 at 5841512)

216 + + Allow git merge ":/<pattern>"

217

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

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

219 + (merged to 'next' on 2011-09-26 at e24a27a)

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

221

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

156 - - Teach progress eye-candy to fetch_refs_from_bundle()

223 + (merged to 'next' on 2011-09-26 at ba140d4)

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

225

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

159 - - filter-branch: use require_clean_work_tree

227 + (merged to 'next' on 2011-09-26 at 206a74a)

228 + + filter-branch: use require_clean_work_tree

229

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

162 - - gitweb: Strip non-printable characters from syntax highlighter output

231 + (merged to 'next' on 2011-09-26 at c79390a)

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

233

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

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

@@ -186,7 +256,8 @@ also loses the ability to escape glob specials. Perhaps drop?

256 - t1402: add some more tests

257

258 * cn/eradicate-working-copy (2011-09-21) 1 commit

189 - - Remove 'working copy' from the documentation and C code

259 + (merged to 'next' on 2011-09-26 at 2683d36)

260 + + Remove 'working copy' from the documentation and C code

261

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

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

@@ -199,7 +270,8 @@ also loses the ability to escape glob specials. Perhaps drop?

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

271

272 * ms/patch-id-with-overlong-line (2011-09-22) 1 commit

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

273 + (merged to 'next' on 2011-09-26 at a33d0b2)

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

275

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

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

@@ -215,15 +287,17 @@ also loses the ability to escape glob specials. Perhaps drop?

287 - Merge branch 'bk/ancestry-path' into jc/branch-desc

288 (this branch uses bk/ancestry-path.)

289

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

219 - - mergetool: no longer need to save standard input

220 - - mergetool: Use args as pathspec to unmerged files

290 +* jm/mergetool-pathspec (2011-09-26) 2 commits

291 + (merged to 'next' on 2011-09-26 at f699566)

292 + + mergetool: no longer need to save standard input

293 + + mergetool: Use args as pathspec to unmerged files

294

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

223 - - Accept tags in HEAD or MERGE_HEAD

224 - - merge: remove global variable head[]

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

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

296 + (merged to 'next' on 2011-09-27 at dc8e2e3)

297 + + Accept tags in HEAD or MERGE_HEAD

298 + + merge: remove global variable head[]

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

300 + + merge: keep stash[] a local variable

301

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

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

@@ -234,11 +308,12 @@ This probably can wait, as long as the other half of the regression fix

308 is in the upcoming release.

309

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

237 - - attr: read core.attributesfile from git_default_core_config

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

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

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

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

311 + (merged to 'next' on 2011-09-26 at 1e0814c)

312 + + attr: read core.attributesfile from git_default_core_config

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

314 + + builtin/mv.c: plug miniscule memory leak

315 + + cleanup: use internal memory allocation wrapper functions everywhere

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

317

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

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

@@ -256,13 +331,15 @@ is in the upcoming release.

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

332

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

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

334 + (merged to 'next' on 2011-09-26 at 4f289a4)

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

336 (this branch uses jk/http-auth-keyring.)

337

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

339

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

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

341 + (merged to 'next' on 2011-09-26 at 525a567)

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

343

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

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

@@ -313,7 +390,6 @@ we have essentially forked from them at their last GPLv2 versions...

390 (merged to 'next' on 2011-09-11 at 2acb0af)

391 + vcs-svn: remove unused functions and make some static

392 + make-static: master

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

393

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

395

@@ -322,10 +398,11 @@ With a few fix-ups; probably needs to be ejected after 1.7.7 happens.

398 + Makefile: Make dependency directory creation less noisy

399

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

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

326 - - remote rename: warn when refspec was not updated

327 - - remote: "rename o foo" should not rename ref "origin/bar"

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

401 + (merged to 'next' on 2011-09-26 at 5e64f68)

402 + + remote: only update remote-tracking branch if updating refspec

403 + + remote rename: warn when refspec was not updated

404 + + remote: "rename o foo" should not rename ref "origin/bar"

405 + + remote: write correct fetch spec when renaming remote 'remote'

406

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

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

@@ -406,19 +483,13 @@ objects contained in the packstream, and this adds such a check.

483 + rebase -i: notice and warn if "exec $cmd" modifies the index or the working tree

484 + rebase -i: clean error message for --continue after failed exec

485

409 -* hv/submodule-merge-search (2011-08-26) 5 commits

410 - - submodule: Search for merges only at end of recursive merge

411 - - allow multiple calls to submodule merge search for the same path

412 - - submodule: Demonstrate known breakage during recursive merge

413 - - push: Don't push a repository with unpushed submodules

414 - (merged to 'next' on 2011-08-24 at 398e764)

415 - + push: teach --recurse-submodules the on-demand option

416 - (this branch is tangled with fg/submodule-auto-push.)

417 -

418 -The second from the bottom one needs to be replaced with a properly

419 -written commit log message.

420 -

421 -* mm/mediawiki-as-a-remote (2011-09-01) 2 commits

486 +* mm/mediawiki-as-a-remote (2011-09-28) 6 commits

487 + (merged to 'next' on 2011-09-28 at a1c9ae5)

488 + + git-remote-mediawiki: allow a domain to be set for authentication

489 + (merged to 'next' on 2011-09-27 at 7ce8254)

490 + + git-remote-mediawiki: obey advice.pushNonFastForward

491 + + git-remote-mediawiki: set 'basetimestamp' to let the wiki handle conflicts

492 + + git-remote-mediawiki: trivial fixes

493 (merged to 'next' on 2011-09-12 at 163c6a5)

494 + git-remote-mediawiki: allow push to set MediaWiki metadata

495 + Add a remote helper to interact with mediawiki (fetch & push)

@@ -478,13 +549,14 @@ looked somewhat suboptimal.

549 (this branch is used by da/make-auto-header-dependencies.)

550

551 * mh/iterate-refs (2011-09-11) 7 commits

481 - - refs.c: make create_cached_refs() static

482 - - Retain caches of submodule refs

483 - - Store the submodule name in struct cached_refs

484 - - Allocate cached_refs objects dynamically

485 - - Change the signature of read_packed_refs()

486 - - Access reference caches only through new function get_cached_refs()

487 - - Extract a function clear_cached_refs()

552 + (merged to 'next' on 2011-09-27 at c289699)

553 + + refs.c: make create_cached_refs() static

554 + + Retain caches of submodule refs

555 + + Store the submodule name in struct cached_refs

556 + + Allocate cached_refs objects dynamically

557 + + Change the signature of read_packed_refs()

558 + + Access reference caches only through new function get_cached_refs()

559 + + Extract a function clear_cached_refs()

560

561 I did not see anything fundamentally wrong with this series, but it was

562 unclear what the benefit of these changes are. If the series were to read

@@ -518,7 +590,9 @@ I do not think there is anything fundamentally wrong with this series, but

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

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

592

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

593 +* jk/http-auth-keyring (2011-09-28) 22 commits

594 + (merged to 'next' on 2011-09-28 at 65ce6c2)

595 + + credential-cache: don't cache items without context

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

597 + check_expirations: don't copy over same element

598 + t0300: add missing EOF terminator for <<

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

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

619 + improve httpd auth tests

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

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

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

622

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

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

What's cooking (2011/09 #08)