ea64bed487 · matheusbsbs/matheus-bagliano

@@ -1,124 +1,100 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Oct 2011, #07; Wed, 19)

3 -X-master-at: 87009edcbd0b4987ccb7ba050a1efe368a315753

4 -X-next-at: cbf5e0b121e34b6b879a06938b34acda5e1b509d

2 +Subject: What's cooking in git.git (Oct 2011, #08; Fri, 21)

3 +X-master-at: 8963314c77af9a4eda5dcbdbab3d4001af83ad81

4 +X-next-at: debedcddff2f53e631c2ab6fdff41d36fd7381df

5

6 -What's cooking in git.git (Oct 2011, #07; Wed, 19)

6 +What's cooking in git.git (Oct 2011, #08; Fri, 21)

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

8

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

10 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

11

12 -The fifth batch of topics started graduating to the master branch. It is

13 -probably a good point to stop taking new topics and start switching our

14 -focus to fixing bugs in the topics already in 'master'.

12 +It probably is a good point to stop taking new topics and start

13 +switching our focus to fixing bugs in the topics already in 'master'.

14

15 Here are the repositories that have my integration branches:

16

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

18

20 - git://git.kernel.org/pub/scm/git/git.git

21 - git://repo.or.cz/alt-git.git

22 - https://code.google.com/p/git-core/

23 - https://github.com/git/git

19 + git://git.kernel.org/pub/scm/git/git.git

20 + git://repo.or.cz/alt-git.git

21 + https://code.google.com/p/git-core/

22 + https://github.com/git/git

23

24 With only maint, master, html and man:

25

27 - git://git.sourceforge.jp/gitroot/git-core/git.git

28 - git://git-core.git.sourceforge.net/gitroot/git-core/git-core

26 + git://git.sourceforge.jp/gitroot/git-core/git.git

27 + git://git-core.git.sourceforge.net/gitroot/git-core/git-core

28

29 With all the topics and integration branches but not todo, html or man:

30

32 - https://github.com/gitster/git

31 + https://github.com/gitster/git

32 +

33 +By the way, I am planning to stop pushing the generated documentation

34 +branches to the above repositories in the near term, as they are not

35 +sources. The only reason the source repository at k.org has hosted these

36 +branches was because it was the only repository over there that was

37 +writable by me; it was an ugly historical and administrative workaround

38 +and not a demonstration of the best practice.

39 +

40 +They are pushed to their own separate repositories instead:

41 +

42 + git://git.kernel.org/pub/scm/git/git-{htmldocs,manpages}.git/

43 + git://repo.or.cz/git-{htmldocs,manpages}.git/

44 + https://code.google.com/p/git-{htmldocs,manpages}.git/

45 + https://github.com/gitster/git-{htmldocs,manpages}.git/

46

47 --------------------------------------------------

48 [New Topics]

49

37 -* jc/match-refs-clarify (2011-09-12) 2 commits

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

39 - - send-pack: typofix error message

50 +* fg/submodule-git-file-git-dir (2011-10-21) 2 commits

51 + - submodule::module_clone(): silence die() message from module_name()

52 + - submodule: whitespace fix

53

41 -* jn/libperl-git-config (2011-10-18) 1 commit

42 - - libperl-git: refactor Git::config_*

54 +* jc/broken-ref-dwim-fix (2011-10-19) 3 commits

55 + (merged to 'next' on 2011-10-19 at 40cad95)

56 + + resolve_ref(): report breakage to the caller without warning

57 + + resolve_ref(): expose REF_ISBROKEN flag

58 + + refs.c: move dwim_ref()/dwim_log() from sha1_name.c

59 + (this branch is tangled with jc/check-ref-format-fixup.)

60

44 -* ss/inet-ntop (2011-10-18) 1 commit

45 - - inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables

61 +This only takes good bits from the failed jc/check-ref-format-fixup topic

62 +and implements saner workaround for the recent breakage on the 'master'.

63 +Will merge to 'master' shortly.

64

47 ---------------------------------------------------

48 -[Graduated to "master"]

49 -

50 -* bk/submodule-in-recursive-merge (2011-10-13) 2 commits

51 - (merged to 'next' on 2011-10-15 at e02205c)

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

53 - + submodule: Demonstrate known breakage during recursive merge

54 -

55 -Brad helped resurrecting good bits earlier tangled in the stalled topic

56 -hv/submodule-merge-search by mistake.

57 -

58 -* cb/httpd-test-fix-port (2011-10-17) 1 commit

59 - (merged to 'next' on 2011-10-17 at 84fb7e6)

60 - + use test number as port number

61 -

62 -* jm/maint-apply-detects-corrupt-patch-header (2011-10-12) 1 commit

63 - (merged to 'next' on 2011-10-12 at 80d9503)

64 - + fix "git apply --index ..." not to deref NULL

65 -

66 -* jn/gitweb-manpages (2011-10-16) 5 commits

67 - (merged to 'next' on 2011-10-16 at 6555a07)

68 - + gitweb: Add gitweb manpages to 'gitweb' package in git.spec

69 - + Documentation: Add gitweb config variables to git-config(1)

70 - + Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages

71 - + gitweb: Add gitweb(1) manpage for gitweb itself

72 - + gitweb: Add gitweb.conf(5) manpage for gitweb configuration files

73 -

74 -* js/log-show-children (2011-10-04) 1 commit

75 - (merged to 'next' on 2011-10-06 at de8f6f2)

76 - + log --children

77 -

78 -* js/maint-no-cherry-pick-head-after-punted (2011-10-06) 2 commits

79 - + cherry-pick: do not give irrelevant advice when cherry-pick punted

80 - + revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so

81 - (this branch is used by js/no-cherry-pick-head-after-punted.)

82 -

83 -Will merge to 'maint' later.

84 -

85 -* js/merge-edit-option (2011-10-12) 1 commit

86 - (merged to 'next' on 2011-10-12 at db28da3)

87 - + Teach merge the '[-e|--edit]' option

88 -

89 -* js/no-cherry-pick-head-after-punted (2011-10-06) 1 commit

90 - (merged to 'next' on 2011-10-10 at acb29ee)

91 - + Merge branch 'js/maint-no-cherry-pick-head-after-punted' into js/no-cherry-pick-head-after-punted

92 - (this branch uses js/maint-no-cherry-pick-head-after-punted.)

93 -

94 -* md/smtp-tls-hello-again (2011-10-15) 1 commit

95 - (merged to 'next' on 2011-10-16 at 3e27de4)

96 - + send-email: Honour SMTP domain when using TLS

97 -

98 -* pt/mingw-misc-fixes (2011-10-15) 7 commits

99 - (merged to 'next' on 2011-10-16 at 2dc0b55)

100 - + t9901: fix line-ending dependency on windows

101 - + mingw: ensure sockets are initialized before calling gethostname

102 - + mergetools: use the correct tool for Beyond Compare 3 on Windows

103 - + t9300: do not run --cat-blob-fd related tests on MinGW

104 - + git-svn: On MSYS, escape and quote SVN_SSH also if set by the user

105 - + t9001: do not fail only due to CR/LF issues

106 - + t1020: disable the pwd test on MinGW

107 -

108 -* rs/diff-whole-function (2011-10-10) 2 commits

109 - (merged to 'next' on 2011-10-11 at 6196752)

110 - + diff: add option to show whole functions as context

111 - + xdiff: factor out get_func_line()

112 -

113 -* rs/pickaxe (2011-10-07) 7 commits

114 - (merged to 'next' on 2011-10-11 at 27d02b2)

115 - + pickaxe: factor out pickaxe

116 - + pickaxe: give diff_grep the same signature as has_changes

117 - + pickaxe: pass diff_options to contains and has_changes

118 - + pickaxe: factor out has_changes

119 - + pickaxe: plug regex/kws leak

120 - + pickaxe: plug regex leak

121 - + pickaxe: plug diff filespec leak with empty needle

65 +* jm/maint-gitweb-filter-forks-fix (2011-10-21) 1 commit

66 + (merged to 'next' on 2011-10-21 at debedcd)

67 + + gitweb: fix regression when filtering out forks

68 +

69 +Will merge to 'master' shortly.

70 +

71 +* lh/gitweb-site-html-head (2011-10-21) 1 commit

72 + - gitweb: provide a way to customize html headers

73 +

74 +Looked Ok.

75 +Will merge to 'next'.

76 +

77 +* mh/ref-api-3 (2011-10-19) 11 commits

78 + - is_refname_available(): reimplement using do_for_each_ref_in_array()

79 + - names_conflict(): simplify implementation

80 + - names_conflict(): new function, extracted from is_refname_available()

81 + - repack_without_ref(): reimplement using do_for_each_ref_in_array()

82 + - do_for_each_ref_in_array(): new function

83 + - do_for_each_ref(): correctly terminate while processesing extra_refs

84 + - add_ref(): take a (struct ref_entry *) parameter

85 + - create_ref_entry(): extract function from add_ref()

86 + - parse_ref_line(): add a check that the refname is properly formatted

87 + - repack_without_ref(): remove temporary

88 + - Rename another local variable name -> refname

89 + (this branch uses mh/ref-api and mh/ref-api-2.)

90 +

91 +Looked reasonable.

92 +Will merge to 'next'.

93 +

94 +* mm/mediawiki-author-fix (2011-10-20) 1 commit

95 + - git-remote-mediawiki: don't include HTTP login/password in author

96 +

97 +Will merge to 'next'.

98

99 --------------------------------------------------

100 [Stalled]

@@ -142,18 +118,6 @@ moved to this topic.

118 Perhaps 281eee4 (revision: keep track of the end-user input from the

119 command line, 2011-08-25) would help.

120

145 -* rr/revert-cherry-pick (2011-10-12) 7 commits

146 - - revert: further simplify parsing of a line in insn sheet

147 - - revert: Simplify passing command-line arguments around

148 - - revert: Allow mixed pick and revert instructions

149 - - revert: Make commit descriptions in insn sheet optional

150 - - revert: Fix buffer overflow in insn sheet parser

151 - - revert: Simplify getting commit subject

152 - - revert: Free memory after get_message call

153 -

154 -Probably needs a little bit more polish, e.g. squashing the tip fixup into

155 -an earlier one in the series.

156 -

121 * jc/lookup-object-hash (2011-08-11) 6 commits

122 - object hash: replace linear probing with 4-way cuckoo hashing

123 - object hash: we know the table size is a power of two

@@ -169,17 +133,47 @@ particular workload.

133 --------------------------------------------------

134 [Cooking]

135

172 -* jc/check-ref-format-fixup (2011-10-12) 2 commits

136 +* rr/revert-cherry-pick (2011-10-19) 6 commits

137 + - revert: simplify communicating command-line arguments

138 + - revert: allow mixed pick and revert instructions

139 + - revert: make commit subjects in insn sheet optional

140 + - revert: fix buffer overflow in insn sheet parser

141 + - revert: simplify getting commit subject in format_todo()

142 + - revert: free msg in format_todo()

143 +

144 +Perhaps 3rd and 4th should be squashed together?

145 +

146 +* jc/match-refs-clarify (2011-09-12) 2 commits

147 + (merged to 'next' on 2011-10-19 at b295e1e)

148 + + rename "match_refs()" to "match_push_refs()"

149 + + send-pack: typofix error message

150 +

151 +Will merge to 'master' shortly.

152 +

153 +* jn/libperl-git-config (2011-10-21) 2 commits

154 + (merged to 'next' on 2011-10-21 at 76e2d4b)

155 + + Add simple test for Git::config_path() in t/t9700-perl-git.sh

156 + + libperl-git: refactor Git::config_*

157 +

158 +Will merge to 'master' shortly.

159 +

160 +* ss/inet-ntop (2011-10-18) 1 commit

161 + (merged to 'next' on 2011-10-19 at 85469f6)

162 + + inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables

163 +

164 +Will merge to 'master' shortly.

165 +

166 +* jc/check-ref-format-fixup (2011-10-19) 3 commits

167 + (merged to 'next' on 2011-10-19 at 98981be)

168 + + Revert "Restrict ref-like names immediately below $GIT_DIR"

169 (merged to 'next' on 2011-10-15 at 8e89bc5)

170 + Restrict ref-like names immediately below $GIT_DIR

171 + refs.c: move dwim_ref()/dwim_log() from sha1_name.c

172 + (this branch is tangled with jc/broken-ref-dwim-fix.)

173

177 -An attempt to fix-up unfortunate side effect of mh/check-ref-format-3

178 -topic. "git show -s config" is never meant to refer to $GIT_DIR/config

179 -and treat it as a file that records an object name. But tightening the

180 -rule for reading side means we would need to tighten the rule for the

181 -writing side, too, which turned out to be rather nasty fallout that

182 -needs to be sorted out before the next release.

174 +This became a no-op except for the bottom one which is part of the other

175 +topic now.

176 +Will discard once the other topic graduates to 'master'.

177

178 * pw/p4-update (2011-10-17) 6 commits

179 (merged to 'next' on 2011-10-17 at f69f6cc)

@@ -240,36 +234,52 @@ Will keep in 'pu' until the planned re-roll comes.

234 + refs: rename "refname" variables

235 + struct ref_entry: document name member

236 + cache.h: add comments for git_path() and git_path_submodule()

243 - (this branch uses mh/ref-api.)

237 + (this branch is used by mh/ref-api-3; uses mh/ref-api.)

238 +

239 +It is either merge this quickly to 'master' and hope there won't be any

240 +more unexpected breakage that forces us to delay the release, or hold it

241 +on 'next' until the next cycle. I am inclined to the former, but not quite

242 +ready to commit to it yet.

243

244 * po/insn-editor (2011-10-17) 1 commit

245 (merged to 'next' on 2011-10-19 at cbf5e0b)

246 + "rebase -i": support special-purpose editor to edit insn sheet

247

249 -* dm/pack-objects-update (2011-10-18) 4 commits

248 +Will merge to 'master' shortly.

249 +

250 +* dm/pack-objects-update (2011-10-20) 4 commits

251 - pack-objects: don't traverse objects unnecessarily

252 - pack-objects: rewrite add_descendants_to_write_order() iteratively

253 - pack-objects: use unsigned int for counter and offset values

254 - pack-objects: mark add_to_write_order() as inline

255

255 -* jk/git-tricks (2011-10-18) 3 commits

256 +Need to re-read this before deciding what to do; it came a bit too late in

257 +the cycle for a series that touches a seriously important part of the

258 +system.

259 +

260 +* jk/git-tricks (2011-10-21) 3 commits

261 - completion: match ctags symbol names in grep patterns

262 - contrib: add git-jump script

263 - contrib: add diff highlight script

264

265 +Will merge to 'next'.

266 +

267 * jc/make-tags (2011-10-18) 1 commit

261 - - Makefile: ask "ls-files" to list source files if available

268 + (merged to 'next' on 2011-10-19 at b0b91bf)

269 + + Makefile: ask "ls-files" to list source files if available

270

263 -* jc/signed-commit (2011-10-18) 3 commits

271 +Will merge to 'master' shortly.

272 +

273 +* jc/signed-commit (2011-10-20) 6 commits

274 + - parse_signed_commit: really use the entire commit log message

275 + - test "commit -S" and "log --show-signature"

276 + - t7004: extract generic "GPG testing" bits

277 - log: --show-signature

278 - commit: teach --gpg-sign option

279 - Split GPG interface into its own helper library

280

268 -This is to replace the earlier "signed push" experiments. "verify-tag"

269 -equivalent needs to be written before this can proceed. I suspect that

270 -teaching "verify-tag" to notice and also handle signed commits would be

271 -the easiest, but "git tag --verify $commit" might look slightly funny

272 -from the UI POV. I dunno.

281 +This is to replace the earlier "signed push" experiments. Probably ready

282 +for 'next'.

283

284 * mh/ref-api (2011-10-16) 7 commits

285 (merged to 'next' on 2011-10-17 at 219000f)

@@ -280,11 +290,14 @@ from the UI POV. I dunno.

290 + invalidate_ref_cache(): expose this function in the refs API

291 + invalidate_ref_cache(): take the submodule as parameter

292 + invalidate_ref_cache(): rename function from invalidate_cached_refs()

283 - (this branch is used by mh/ref-api-2.)

293 + (this branch is used by mh/ref-api-2 and mh/ref-api-3.)

294

285 -Will merge to 'master' in the sixth wave.

295 +It is either merge this quickly to 'master' and hope there won't be any

296 +more unexpected breakage that forces us to delay the release, or hold it

297 +on 'next' until the next cycle. I am inclined to the former, but not quite

298 +ready to commit to it yet.

299

287 -* sg/complete-refs (2011-10-15) 10 commits

300 +* sg/complete-refs (2011-10-21) 9 commits

301 - completion: remove broken dead code from __git_heads() and __git_tags()

302 - completion: fast initial completion for config 'remote.*.fetch' value

303 - completion: improve ls-remote output filtering in __git_refs_remotes()

@@ -294,7 +307,6 @@ Will merge to 'master' in the sixth wave.

307 - completion: make refs completion consistent for local and remote repos

308 - completion: optimize refs completion

309 - completion: document __gitcomp()

297 - - Merge branches 'tm/completion-push-set-upstream', 'tm/completion-commit-fixup-squash' and 'sg/completion' into HEAD

310

311 Rerolled.

312

@@ -306,7 +318,7 @@ completion in the past comes.

318 + bundle: add parse_bundle_header() helper function

319 + bundle: allowing to read from an unseekable fd

320

309 -I am not entirely happy with the first patch but it is not so bad either.

321 +Will merge to 'master' shortly.

322

323 * jk/daemon-msgs (2011-10-15) 1 commit

324 (merged to 'next' on 2011-10-15 at 415cf53)

@@ -375,38 +387,3 @@ Will merge to 'master' in the fifth wave.

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

388

389 Will merge to 'master' in the sixth wave.

378 -

379 ---------------------------------------------------

380 -[Discarded]

381 -

382 -* jk/http-auth-keyring (2011-10-12) 19 commits

383 - . http_init: accept separate URL parameter

384 - . credential-cache: don't cache items without context

385 - . check_expirations: don't copy over same element

386 - . t0300: add missing EOF terminator for <<

387 - . credential-store: use a better storage format

388 - . t0300: make alternate username tests more robust

389 - . t0300: make askpass tests a little more robust

390 - . credential-cache: fix expiration calculation corner cases

391 - . docs: minor tweaks to credentials API

392 - . credentials: make credential_fill_gently() static

393 - . credentials: add "getpass" helper

394 - . credentials: add "store" helper

395 - . credentials: add "cache" helper

396 - . docs: end-user documentation for the credential subsystem

397 - . http: use hostname in credential description

398 - . allow the user to configure credential helpers

399 - . look for credentials in config before prompting

400 - . http: use credential API to get passwords

401 - . introduce credentials API

402 - (this branch is used by js/cred-macos-x-keychain-2.)

403 -

404 -Discarded without prejudice to allow design level discussions to continue.

405 -Expecting a re-roll based on jk/http-auth

406 -

407 -* js/cred-macos-x-keychain-2 (2011-10-12) 1 commit

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

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

410 -

411 -Discarded without prejudice to allow design level discussions to continue.

412 -Expecting a re-roll based on jk/http-auth

What's cooking (2011/10 #08)