bf278b8308 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Sep 2011, #02; Tue, 6)

3 -X-master-at: 50963badbcfe2693d7a51ace3079c6b48ec52f01

4 -X-next-at: 7931f38a2fd882b0f75a4d6f0eb60c3b1b094178

2 +Subject: What's cooking in git.git (Sep 2011, #03; Sun, 11)

3 +X-master-at: 2f9e2e75874e0f0722382106e2e189cc3f95cc7d

4 +X-next-at: 3361ec88dee79e371d3b68c985d8dd7bdc0c4e6c

5

6 -What's cooking in git.git (Sep 2011, #02; Tue, 6)

6 +What's cooking in git.git (Sep 2011, #03; Sun, 11)

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

8

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

@@ -14,61 +14,114 @@ to "master" and are being fast tracked for 1.7.7-rc1, but otherwise

14 patches for new features and fixes to longstanding issues will stay in

15 'pu' or 'next' until the 1.7.7 final.

16

17 ---------------------------------------------------

18 -[Graduated to "master"]

17 +I was hoping that k.org would be back into healthy state soonish and that

18 +is why I haven't tagged the -rc1 yet, but it has already been two weeks,

19 +so sometime in the middle of the coming week -rc1 will happen with or

20 +without k.org repository keeping in sync with us.

21

20 -* cb/maint-ls-files-error-report (2011-08-28) 1 commit

21 - (merged to 'next' on 2011-08-30 at b606e19)

22 - + t3005: do not assume a particular order of stdout and stderr of git-ls-files

22 +In the meantime, here are the repositories that have my integration

23 +branches:

24

24 -* mh/check-ref-format-print-normalize (2011-08-27) 2 commits

25 - (merged to 'next' on 2011-08-30 at e827410)

26 - + Forbid DEL characters in reference names

27 - + check-ref-format --print: Normalize refnames that start with slashes

25 +With maint, master, next, pu and todo:

26

29 -* rc/histogram-diff (2011-08-31) 1 commit

30 - (merged to 'next' on 2011-09-02 at be4d245)

31 - + xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()

27 + url = git://repo.or.cz/alt-git.git

28 + url = https://code.google.com/p/git-core/

29

33 ---------------------------------------------------

34 -[New Topics]

30 +With only maint and master:

31

36 -* cb/common-prefix-unification (2011-09-06) 3 commits

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

38 - - consolidate pathspec_prefix and common_prefix

39 - - remove prefix argument from pathspec_prefix

32 + url = git://git.sourceforge.jp/gitroot/git-core/git.git

33 + url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core

34

41 -* cb/maint-quiet-push (2011-09-05) 4 commits

42 - . t5541: avoid TAP test miscounting

43 - . push: old receive-pack does not understand --quiet

44 - . fix push --quiet via http

45 - . tests for push --quiet

46 -

47 -Dropped for rerolling after 1.7.7 cycle.

35 +With all the topics and integration branches:

36

49 -* cb/send-email-help (2011-09-05) 1 commit

50 - - send-email: add option -h

37 + url = https://github.com/gitster/git

38

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

53 - - test: fetch/receive with fsckobjects

54 - - transfer.fsckobjects: unify fetch/receive.fsckobjects

55 - - fetch.fsckobjects: verify downloaded objects

56 -

57 -* jc/receive-verify (2011-09-02) 3 commits

58 - - receive-pack: check connectivity before concluding "git push"

59 - - check_everything_connected(): libify

60 - - check_everything_connected(): refactor to use an iterator

61 - (this branch uses jc/fetch-verify, jc/fetch-verify and jc/traverse-commit-list.)

62 -

63 -* tr/doc-note-rewrite (2011-09-05) 1 commit

64 - - Documentation: "on for all" configuration of notes.rewriteRef

65 -

66 -* jc/request-pull-show-head (2011-09-06) 1 commit

67 - - State what commit to expect in request-pull

39 +--------------------------------------------------

40 +[New Topics]

41

69 -* jn/maint-http-error-message (2011-09-06) 2 commits

70 - - http: avoid empty error messages for some curl errors

71 - - http: remove extra newline in error message

42 +* hl/iso8601-more-zone-formats (2011-09-09) 2 commits

43 + - fixup? simplification and tightening

44 + - date.c: Support iso8601 timezone formats

45 +

46 +* jc/signed-push (2011-09-09) 7 commits

47 + . push -s: support pre-receive-signature hook

48 + . push -s: receiving end

49 + . push -s: send signed push certificate

50 + . push -s: skeleton

51 + . refactor run_receive_hook()

52 + - Split GPG interface into its own helper library

53 + - send-pack: typofix error message

54 + (this branch is tangled with jc/signed-push-3.)

55 +

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

57 +

58 +* jc/signed-push-3 (2011-09-09) 4 commits

59 + - push -s: signed push

60 + - rename "match_refs()" to "match_push_refs()"

61 + - Split GPG interface into its own helper library

62 + - send-pack: typofix error message

63 + (this branch is tangled with jc/signed-push.)

64 +

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

66 +the sending end.

67 +

68 +* jc/run-receive-hook-cleanup (2011-09-09) 1 commit

69 + - refactor run_receive_hook()

70 +

71 +This is a remnant in the jc/signed-push topic that has become unnecessary

72 +for the purpose of jc/signed-push-3, but is retained for its clean-up

73 +value.

74 +

75 +The corresponding one will be dropped when rebuilding the jc/signed-push

76 +topic on top of this topic later.

77 +

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

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

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

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

82 + - t6300: add more body-parsing tests

83 + - t7004: factor out gpg setup

84 +

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

86 + - sha1_file: normalize alt_odb path before comparing and storing

87 +

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

89 + - obstack.c: Fix some sparse warnings

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

91 +

92 +* jc/make-static (2011-09-11) 2 commits

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

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

95 + + make-static: master

96 +

97 +* jl/maint-fetch-submodule-check-fix (2011-09-09) 1 commit

98 + - fetch: skip on-demand checking when no submodules are configured

99 +

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

101 + - Makefile: Make dependency directory creation less noisy

102 +

103 +* js/cred-macos-x-keychain (2011-09-11) 1 commit

104 + - contrib: add a credential helper for Mac OS X's keychain

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

106 +

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

108 + - Add tools to avoid the use of unnormalized refnames.

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

110 + - Add a library function normalize_refname()

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

112 + - fixup asciidoc formatting

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

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

115 + - t1402: add some more tests

116 +

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

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

119 + - remote rename: warn when refspec was not updated

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

121 + - remote: write correct fetch spec when renaming remote 'remote'

122 +

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

124 + - t9159-*.sh: Add an svn version check

125

126 --------------------------------------------------

127 [Stalled]

@@ -105,7 +158,8 @@ Would need another round to separate per-pack and per-session limits.

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

159 Cf. $gmane/176254, 176255, 166256

160

108 -* jk/generation-numbers (2011-07-14) 7 commits

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

162 + - metadata-cache.c: make two functions static

163 - limit "contains" traversals based on commit generation

164 - check commit generation cache validity against grafts

165 - pretty: support %G to show the generation number of a commit

@@ -130,6 +184,41 @@ I think a further refactoring (no, not my suggestion) was offered?

184 --------------------------------------------------

185 [Cooking]

186

187 +* cb/common-prefix-unification (2011-09-11) 4 commits

188 + - dir.c: make common_prefix_len() static

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

190 + - consolidate pathspec_prefix and common_prefix

191 + - remove prefix argument from pathspec_prefix

192 +

193 +* cb/send-email-help (2011-09-05) 1 commit

194 + - send-email: add option -h

195 +

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

197 + - test: fetch/receive with fsckobjects

198 + - transfer.fsckobjects: unify fetch/receive.fsckobjects

199 + - fetch.fsckobjects: verify downloaded objects

200 +

201 +* jc/receive-verify (2011-09-09) 6 commits

202 + - receive-pack: check connectivity before concluding "git push"

203 + - check_everything_connected(): libify

204 + - check_everything_connected(): refactor to use an iterator

205 + - fetch: verify we have everything we need before updating our ref

206 + - rev-list --verify-object

207 + - list-objects: pass callback data to show_objects()

208 + (this branch uses jc/traverse-commit-list; is tangled with jc/fetch-verify and jc/fetch-verify.)

209 +

210 +* tr/doc-note-rewrite (2011-09-05) 1 commit

211 + - Documentation: "on for all" configuration of notes.rewriteRef

212 +

213 +It was questioned if the new text suggests a sane and safe thing to do.

214 +

215 +* jc/request-pull-show-head (2011-09-06) 1 commit

216 + - State what commit to expect in request-pull

217 +

218 +* jn/maint-http-error-message (2011-09-06) 2 commits

219 + - http: avoid empty error messages for some curl errors

220 + - http: remove extra newline in error message

221 +

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

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

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

@@ -139,7 +228,9 @@ I think a further refactoring (no, not my suggestion) was offered?

228 The topic came up a bit too late in the cycle.

229 Will cook for a while.

230

142 -* mg/branch-list (2011-08-28) 5 commits

231 +* mg/branch-list (2011-09-08) 6 commits

232 + (merged to 'next' on 2011-09-11 at 20a9cdb)

233 + + branch: -v does not automatically imply --list

234 (merged to 'next' on 2011-09-02 at b818eae)

235 + branch: allow pattern arguments

236 + branch: introduce --list option

@@ -161,12 +252,14 @@ Not urgent; the topic came up a bit too late in the cycle.

252

253 Not urgent; I fixed up the test breakage just for fun.

254

164 -* hv/submodule-merge-search (2011-08-26) 4 commits

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

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

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

258 - submodule: Demonstrate known breakage during recursive merge

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

169 - (this branch uses fg/submodule-auto-push.)

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

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

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

263

264 Not urgent; the topic came up a bit too late in the cycle.

265 The bottom one needs to be replaced with a properly written commit log message.

@@ -235,10 +328,12 @@ Not urgent; the topic came up a bit too late in the cycle.

328

329 Not urgent; the topic came up a bit too late in the cycle.

330

238 -* fg/submodule-auto-push (2011-08-20) 1 commit

331 +* fg/submodule-auto-push (2011-09-11) 2 commits

332 + (merged to 'next' on 2011-09-11 at 3fc86f7)

333 + + submodule.c: make two functions static

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

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

241 - (this branch is used by hv/submodule-merge-search.)

336 + (this branch is tangled with hv/submodule-merge-search.)

337

338 What the topic aims to achieve may make sense, but the implementation

339 looked somewhat suboptimal.

@@ -247,7 +342,7 @@ looked somewhat suboptimal.

342 - fetch: verify we have everything we need before updating our ref

343 - rev-list --verify-object

344 - list-objects: pass callback data to show_objects()

250 - (this branch is used by jc/receive-verify and jc/receive-verify; uses jc/traverse-commit-list.)

345 + (this branch uses jc/traverse-commit-list; is tangled with jc/receive-verify and jc/receive-verify.)

346

347 Make "git fetch" verify what it received a bit more carefully before

348 updating the refs in the receiving end.

@@ -270,7 +365,8 @@ Not urgent; will not be in 1.7.7.

365

366 Not urgent; will not be in 1.7.7.

367

273 -* mh/iterate-refs (2011-08-14) 6 commits

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

369 + - refs.c: make create_cached_refs() static

370 - Retain caches of submodule refs

371 - Store the submodule name in struct cached_refs

372 - Allocate cached_refs objects dynamically

@@ -318,7 +414,9 @@ feature. Will keep it in 'next' at least for one cycle.

414

415 Not urgent; will not be in 1.7.7.

416

321 -* jk/http-auth-keyring (2011-08-03) 13 commits

417 +* jk/http-auth-keyring (2011-09-11) 14 commits

418 + (merged to 'next' on 2011-09-11 at 491ce6a)

419 + + credentials: make credential_fill_gently() static

420 (merged to 'next' on 2011-08-03 at b06e80e)

421 + credentials: add "getpass" helper

422 + credentials: add "store" helper

@@ -333,6 +431,7 @@ Not urgent; will not be in 1.7.7.

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

432 + improve httpd auth tests

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

434 + (this branch is used by js/cred-macos-x-keychain.)

435

436 Looked mostly reasonable except for the limitation that it is not clear

437 how to deal with a site at which a user needs to use different passwords

@@ -341,7 +440,9 @@ until we start hearing real-world success reports on the list.

440

441 Not urgent; will not be in 1.7.7.

442

344 -* rr/revert-cherry-pick-continue (2011-08-08) 18 commits

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

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

445 + + builtin/revert.c: make commit_list_append() static

446 (merged to 'next' on 2011-08-24 at 712c115)

447 + revert: Propagate errors upwards from do_pick_commit

448 + revert: Introduce --continue to continue the operation

@@ -370,3 +471,11 @@ Not urgent; will not be in 1.7.7.

471

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

473 . support pager.* for aliases

474 +

475 +* cb/maint-quiet-push (2011-09-05) 4 commits

476 + . t5541: avoid TAP test miscounting

477 + . push: old receive-pack does not understand --quiet

478 + . fix push --quiet via http

479 + . tests for push --quiet

480 +

481 +Dropped for rerolling after 1.7.7 cycle.

What's cooking (2011/09 #03)