24549c40bc · matheusbsbs/matheus-bagliano

@@ -1,18 +1,20 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Dec 2011, #08; Thu, 22)

3 -X-master-at: 5d6dfc7cb140a6eb90138334fab2245b69bc8bc4

4 -X-next-at: 7d1ccddcec7e93d27acda459c41e32851e845d51

2 +Subject: What's cooking in git.git (Dec 2011, #09; Tue, 27)

3 +X-master-at: ec330158ec04849fe5ff2cb8749797cd63ae592b

4 +X-next-at: 551ac8f4336eaa5d2cf05fd3dec4a3676b57379f

5

6 -What's cooking in git.git (Dec 2011, #08; Thu, 22)

6 +What's cooking in git.git (Dec 2011, #09; Tue, 27)

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

11 'next'.

12

13 -The tip of 'master' is now feature complete for 1.7.9 so I could tag it as

14 -the -rc0, but I'll let it simmer for several days to give people chance to

15 -test over the holidays.

13 +By now I know a bit better than taking the lack of serious regression

14 +reports during the holiday weekend as a sign of perfection of the upcoming

15 +release, but I will tag -rc0 soonish anyway. As far as I can see the tip

16 +of 'master' is feature complete for 1.7.9, modulo possible bugs and

17 +regressions.

18

19 Here are the repositories that have my integration branches:

20

@@ -42,9 +44,36 @@ The preformatted documentation in HTML and man format are found in:

44 --------------------------------------------------

45 [New Topics]

46

45 -* tr/doc-sh-setup (2011-12-20) 1 commit

46 - (merged to 'next' on 2011-12-21 at bd73695)

47 - + git-sh-setup: make require_clean_work_tree part of the interface

47 +* jh/fetch-head-update (2011-12-27) 1 commit

48 + - write first for-merge ref to FETCH_HEAD first

49 +

50 +Needs sign-off. I have squashed minimal fixes in.

51 +

52 +* jv/maint-config-set (2011-12-27) 1 commit

53 + (merged to 'next' on 2011-12-27 at 551ac8f)

54 + + Fix an incorrect reference to --set-all.

55 +

56 +Will merge to "master" before -rc0.

57 +

58 +* nd/index-pack-no-recurse (2011-12-27) 4 commits

59 + - fixup! 3413d4d

60 + - index-pack: eliminate unlimited recursion in get_delta_base()

61 + - index-pack: eliminate recursion in find_unresolved_deltas

62 + - Eliminate recursion in setting/clearing marks in commit list

63 +

64 +Expecting a reroll.

65 +

66 +* ss/git-svn-askpass (2011-12-27) 5 commits

67 + - make askpass_prompt a global prompt method for asking users

68 + - ignore empty *_ASKPASS variables

69 + - honour *_ASKPASS for querying username and for querying further actions like unknown certificates

70 + - switch to central prompt method

71 + - add central method for prompting a user using GIT_ASKPASS or SSH_ASKPASS

72 +

73 +Expecting a reroll.

74 +

75 +--------------------------------------------------

76 +[Graduated to "master"]

77

78 * ab/sun-studio-portability (2011-12-21) 3 commits

79 (merged to 'next' on 2011-12-21 at 0cc5a63)

@@ -52,157 +81,39 @@ The preformatted documentation in HTML and man format are found in:

81 + Fix a bitwise negation assignment issue spotted by Sun Studio

82 + Fix an enum assignment issue spotted by Sun Studio

83

84 +* jn/maint-gitweb-utf8-fix (2011-12-19) 4 commits

85 + (merged to 'next' on 2011-12-20 at b816812)

86 + + gitweb: Fix fallback mode of to_utf8 subroutine

87 + + gitweb: Output valid utf8 in git_blame_common('data')

88 + + gitweb: esc_html() site name for title in OPML

89 + + gitweb: Call to_utf8() on input string in chop_and_escape_str()

90 +

91 +* rr/revert-cherry-pick (2011-12-15) 6 commits

92 + (merged to 'next' on 2011-12-21 at d0428dc)

93 + + t3502, t3510: clarify cherry-pick -m failure

94 + + t3510 (cherry-pick-sequencer): use exit status

95 + + revert: simplify getting commit subject in format_todo()

96 + + revert: tolerate extra spaces, tabs in insn sheet

97 + + revert: make commit subjects in insn sheet optional

98 + + revert: free msg in format_todo()

99 +

100 * tr/bash-read-unescaped (2011-12-21) 1 commit

101 (merged to 'next' on 2011-12-21 at de865c1)

102 + bash completion: use read -r everywhere

103

59 -* jc/advise-i18n (2011-12-22) 1 commit

60 - - i18n of multi-line advice messages

61 -

62 -Allow localization of advice messages that tend to be longer and

63 -multi-line formatted. For now this is deliberately limited to advise()

64 -interface and not vreportf() in general as touching the latter has

65 -interactions with error() that has plumbing callers whose prefix "error: "

66 -should never be translated.

104 +* tr/doc-sh-setup (2011-12-20) 1 commit

105 + (merged to 'next' on 2011-12-21 at bd73695)

106 + + git-sh-setup: make require_clean_work_tree part of the interface

107

68 ---------------------------------------------------

69 -[Graduated to "master"]

108 +* tr/pty-all (2011-12-19) 1 commit

109 + (merged to 'next' on 2011-12-20 at 9b637d3)

110 + + test-terminal: set output terminals to raw mode

111

71 -* cn/maint-lf-to-crlf-filter (2011-12-16) 1 commit

72 - (merged to 'next' on 2011-12-20 at 83d6f7c)

73 - + lf_to_crlf_filter(): tell the caller we added "\n" when draining

74 - (this branch is used by jc/maint-lf-to-crlf-keep-crlf.)

75 -

76 -A recent fix to the codepath was not quite correct.

77 -

78 -* ef/setenv-putenv (2011-12-14) 2 commits

79 - (merged to 'next' on 2011-12-20 at 4845020)

80 - + compat/setenv.c: error if name contains '='

81 - + compat/setenv.c: update errno when erroring out

82 - (this branch is used by ef/x-setenv-putenv.)

83 -

84 -* jc/advice-doc (2011-12-18) 1 commit

85 - (merged to 'next' on 2011-12-19 at 0b410e5)

86 - + advice: Document that they all default to true

87 - (this branch is used by jc/advise-push-default.)

88 -

89 -* jc/maint-lf-to-crlf-keep-crlf (2011-12-18) 1 commit

90 - (merged to 'next' on 2011-12-20 at eee6eb3)

91 - + lf_to_crlf_filter(): resurrect CRLF->CRLF hack

92 -

93 -The lf-to-crlf filter in the streaming checkout codepath forgot that we

94 -try not to convert LF to CRLF if the repository data already has CRLF.

95 -

96 -* jc/request-pull-show-head-4 (2011-12-19) 2 commits

97 - (merged to 'next' on 2011-12-19 at 771939b)

98 - + request-pull: do not emit "tag" before the tagname

99 - (merged to 'next' on 2011-12-16 at bea51ac)

100 - + request-pull: update the "pull" command generation logic

101 -

102 -* jk/doc-fsck (2011-12-16) 1 commit

103 - (merged to 'next' on 2011-12-20 at 70df8a4)

104 - + docs: brush up obsolete bits of git-fsck manpage

105 -

106 -* jk/follow-rename-score (2011-12-16) 1 commit

107 - (merged to 'next' on 2011-12-20 at 74db2a9)

108 - + use custom rename score during --follow

109 -

110 -* jk/git-prompt (2011-12-12) 10 commits

111 - (merged to 'next' on 2011-12-20 at 24aff90)

112 - + contrib: add credential helper for OS X Keychain

113 - + Makefile: OS X has /dev/tty

114 - + Makefile: linux has /dev/tty

115 - + credential: use git_prompt instead of git_getpass

116 - + prompt: use git_terminal_prompt

117 - + add generic terminal prompt function

118 - + refactor git_getpass into generic prompt function

119 - + move git_getpass to its own source file

120 - + imap-send: don't check return value of git_getpass

121 - + imap-send: avoid buffer overflow

122 -

123 -* jk/http-push-to-empty (2011-12-19) 1 commit

124 - (merged to 'next' on 2011-12-19 at 845e2a1)

125 - + remote-curl: don't pass back fake refs

126 -

127 -* jk/maint-do-not-feed-stdin-to-tests (2011-12-15) 1 commit

128 - (merged to 'next' on 2011-12-20 at 43e83c5)

129 - + test-lib: redirect stdin of tests

130 -

131 -* jk/maint-push-v-is-verbose (2011-12-17) 1 commit

132 - (merged to 'next' on 2011-12-20 at b79f101)

133 - + make "git push -v" actually verbose

134 -

135 -* jk/maint-strbuf-missing-init (2011-12-18) 2 commits

136 - (merged to 'next' on 2011-12-20 at 72fa8ae)

137 - + Update jk/maint-strbuf-missing-init to builtin/ rename

138 - + commit, merge: initialize static strbuf

139 -

140 -* jk/pretty-reglog-ent (2011-12-16) 1 commit

141 - (merged to 'next' on 2011-12-20 at 949b010)

142 - + pretty: give placeholders to reflog identity

143 -

144 -* jn/test-cleanup-7006 (2011-12-14) 1 commit

145 - (merged to 'next' on 2011-12-20 at 952f48f)

146 - + test: errors preparing for a test are not special

147 -

148 -* mh/ref-api (2011-12-12) 16 commits

149 - (merged to 'next' on 2011-12-15 at d65a830)

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

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

152 - + repack_without_ref(): remove temporary

153 - + resolve_gitlink_ref_recursive(): change to work with struct ref_cache

154 - + Pass a (ref_cache *) to the resolve_gitlink_*() helper functions

155 - + resolve_gitlink_ref(): improve docstring

156 - + get_ref_dir(): change signature

157 - + refs: change signatures of get_packed_refs() and get_loose_refs()

158 - + is_dup_ref(): extract function from sort_ref_array()

159 - + add_ref(): add docstring

160 - + parse_ref_line(): add docstring

161 - + is_refname_available(): remove the "quiet" argument

162 - + clear_ref_array(): rename from free_ref_array()

163 - + refs: rename parameters result -> sha1

164 - + refs: rename "refname" variables

165 - + struct ref_entry: document name member

166 - (this branch is used by mh/ref-api-rest.)

167 -

168 -Later part split out to expedite moving the earlier good bits forward.

169 -

170 -* nd/war-on-nul-in-commit (2011-12-15) 3 commits

171 - (merged to 'next' on 2011-12-20 at d441111)

172 - + commit_tree(): refuse commit messages that contain NULs

173 - + Convert commit_tree() to take strbuf as message

174 - + merge: abort if fails to commit

175 -

176 -* rs/diff-tree-combined-clean-up (2011-12-17) 3 commits

177 - (merged to 'next' on 2011-12-20 at 265e049)

178 - + submodule: use diff_tree_combined_merge() instead of diff_tree_combined()

179 - + pass struct commit to diff_tree_combined_merge()

180 - + use struct sha1_array in diff_tree_combined()

181 -

182 -* tr/grep-threading (2011-12-16) 3 commits

183 - (merged to 'next' on 2011-12-20 at 1a852ef)

184 - + grep: disable threading in non-worktree case

185 - + grep: enable threading with -p and -W using lazy attribute lookup

186 - + grep: load funcname patterns for -W

112 +Kept only the second one from the original.

113

114 --------------------------------------------------

115 [Stalled]

116

191 -* pw/p4-docs-and-tests (2011-12-18) 11 commits

192 - - git-p4: document and test submit options

193 - - git-p4: test and document --use-client-spec

194 - - git-p4: test --keep-path

195 - - git-p4: test --max-changes

196 - - git-p4: document and test --import-local

197 - - git-p4: honor --changesfile option and test

198 - - git-p4: document and test clone --branch

199 - - git-p4: test cloning with two dirs, clarify doc

200 - - git-p4: clone does not use --git-dir

201 - - git-p4: test debug macro

202 - - git-p4: introduce asciidoc documentation

203 -

204 -Waiting for a reroll.

205 -

117 * jc/advise-push-default (2011-12-18) 1 commit

118 - push: hint to use push.default=upstream when appropriate

119

@@ -268,30 +179,33 @@ At least pack-objects and fsck need to learn the new encoding for the

179 series to be usable locally, and then index-pack/unpack-objects needs to

180 learn it to be used remotely.

181

271 ---------------------------------------------------

272 -[Cooking]

182 +* jc/advise-i18n (2011-12-22) 1 commit

183 + - i18n of multi-line advice messages

184

274 -* jn/maint-gitweb-utf8-fix (2011-12-19) 4 commits

275 - (merged to 'next' on 2011-12-20 at b816812)

276 - + gitweb: Fix fallback mode of to_utf8 subroutine

277 - + gitweb: Output valid utf8 in git_blame_common('data')

278 - + gitweb: esc_html() site name for title in OPML

279 - + gitweb: Call to_utf8() on input string in chop_and_escape_str()

185 +Allow localization of advice messages that tend to be longer and

186 +multi-line formatted. For now this is deliberately limited to advise()

187 +interface and not vreportf() in general as touching the latter has

188 +interactions with error() that has plumbing callers whose prefix "error: "

189 +should never be translated.

190

281 -* tr/pty-all (2011-12-19) 1 commit

282 - (merged to 'next' on 2011-12-20 at 9b637d3)

283 - + test-terminal: set output terminals to raw mode

191 +--------------------------------------------------

192 +[Cooking]

193

285 -Kept only the second one from the original.

194 +* pw/p4-docs-and-tests (2011-12-27) 11 commits

195 + - git-p4: document and test submit options

196 + - git-p4: test and document --use-client-spec

197 + - git-p4: test --keep-path

198 + - git-p4: test --max-changes

199 + - git-p4: document and test --import-local

200 + - git-p4: honor --changesfile option and test

201 + - git-p4: document and test clone --branch

202 + - git-p4: test cloning with two dirs, clarify doc

203 + - git-p4: clone does not use --git-dir

204 + - git-p4: introduce asciidoc documentation

205 + - rename git-p4 tests

206

287 -* rr/revert-cherry-pick (2011-12-15) 6 commits

288 - (merged to 'next' on 2011-12-21 at d0428dc)

289 - + t3502, t3510: clarify cherry-pick -m failure

290 - + t3510 (cherry-pick-sequencer): use exit status

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

292 - + revert: tolerate extra spaces, tabs in insn sheet

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

294 - + revert: free msg in format_todo()

207 +Rorolled.

208 +Not urgent.

209

210 * jc/signed-commit (2011-11-29) 5 commits

211 (merged to 'next' on 2011-12-21 at 8fcbf00)

@@ -301,11 +215,7 @@ Kept only the second one from the original.

215 + log: --show-signature

216 + commit: teach --gpg-sign option

217

304 -* jc/push-ignore-stale (2011-12-14) 2 commits

305 - - push: --ignore-stale option

306 - - set_ref_status_for_push(): use transport-flags abstraction

307 -

308 -Probably solving a wrong problem and encouraging a wrong workflow while at

309 -it. jc/advise-push-default might be a better approach.

218 +I am ambivalent on this one. I do not desperately need it myself, I know

219 +the kernel folks do not, I heard some other people might.

220

311 -Will drop.

221 +Opinions?

What's cooking (2011/12 #09)