beb65c4167 · matheusbsbs/matheus-bagliano

@@ -1,20 +1,17 @@

1 To: git@vger.kernel.org

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

3 -X-master-at: ec330158ec04849fe5ff2cb8749797cd63ae592b

4 -X-next-at: 551ac8f4336eaa5d2cf05fd3dec4a3676b57379f

2 +Subject: What's cooking in git.git (Jan 2012, #01; Thu, 5)

3 +X-master-at: 247f9d23da8cfd255533433ad2aa07d172afac0b

4 +X-next-at: 5da3ae2f29b4c8b897e934b1856cbb7753383aee

5

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

6 +What's cooking in git.git (Jan 2012, #01; Thu, 5)

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 -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.

13 +I'll be tagging 1.7.9-rc0 after merging a few topics to "master" to make

14 +it feature complete for the upcoming release tomorrow.

15

16 Here are the repositories that have my integration branches:

17

@@ -44,76 +41,121 @@ The preformatted documentation in HTML and man format are found in:

41 --------------------------------------------------

42 [New Topics]

43

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

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

44 +* ss/git-svn-prompt-sans-terminal (2012-01-04) 3 commits

45 + - fixup! 15eaaf4

46 + - git-svn, perl/Git.pm: extend Git::prompt helper for querying users

47 + (merged to 'next' on 2012-01-05 at 954f125)

48 + + perl/Git.pm: "prompt" helper to honor GIT_ASKPASS and SSH_ASKPASS

49

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

50 +The bottom one has been replaced with a rewrite based on comments from

51 +Ævar. The second one needs more work, both in perl/Git.pm and prompt.c, to

52 +give precedence to tty over SSH_ASKPASS when terminal is available.

53

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.

54 +I think it is OK to include the first one in the upcoming release, but we

55 +may want to wait and defer both to the next cycle.

56

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

57 +* pw/p4-view-updates (2012-01-03) 6 commits

58 + (merged to 'next' on 2012-01-03 at c3b5872)

59 + + git-p4: view spec documentation

60 + + git-p4: rewrite view handling

61 + + git-p4: support single file p4 client view maps

62 + + git-p4: sort client views by reverse View number

63 + + git-p4: fix test for unsupported P4 Client Views

64 + + git-p4: test client view handling

65

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

66 +Will merge to 'master' by 1.7.9 final.

67 +Unless real git-p4 users object (I am not one of them, so I cannot really

68 +judge), that is.

69

64 -Expecting a reroll.

70 +* cb/git-daemon-tests (2012-01-04) 1 commit

71 + (merged to 'next' on 2012-01-05 at 86f3e93)

72 + + daemon: add tests

73

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

74 +It stirred a related discussion on how the process termination should be

75 +handled in the daemon, but the test queued should be OK as-is on systems

76 +that have "pkill" (which is outside POSIX).

77

73 -Expecting a reroll.

78 +* jc/show-sig (2012-01-05) 6 commits

79 + (merged to 'next' on 2012-01-05 at 5da3ae2)

80 + + log --show-signature: reword the common two-head merge case

81 + + log-tree: show mergetag in log --show-signature output

82 + + log-tree.c: small refactor in show_signature()

83 + + commit --amend -S: strip existing gpgsig headers

84 + + verify_signed_buffer: fix stale comment

85 + + Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag'

86 + (this branch uses jc/signed-commit.)

87 +

88 +Finishing touches to the already graduated "pull signed tags" topic.

89 +

90 +Will merge to 'master' by 1.7.9 final.

91 +

92 +* jm/stash-diff-disambiguate (2012-01-01) 1 commit

93 + (merged to 'next' on 2012-01-05 at 75a283b)

94 + + stash: Don't fail if work dir contains file named 'HEAD'

95 +

96 +Will merge to 'master' by 1.7.9 final.

97 +

98 +* mm/maint-gitweb-project-maxdepth (2012-01-04) 1 commit

99 + - gitweb: accept trailing "/" in $project_list

100 +

101 +Looked quite sensible.

102 +Will merge to 'master' by 1.7.9 final.

103 +

104 +* nd/shallow-clone-without-tag-following (2012-01-05) 1 commit

105 + - Limit refs to fetch to minimum in shallow clones

106 +

107 +Needs adjustment of t5500 at least, and possibly an option to ask for the

108 +traditional "shallowly clone all branches" behaviour.

109 +

110 +* jk/parse-object-cached (2012-01-05) 1 commit

111 + - parse_object: try internal cache before reading object db

112 +

113 +This is a bit scary change, but I do not think of a way it would break

114 +anything that is currently working correctly.

115 +

116 +* jn/maint-gitweb-grep-fix (2012-01-05) 2 commits

117 + - gitweb: Harden "grep" search against filenames with ':'

118 + - gitweb: Fix file links in "grep" search

119 +

120 +Waiting for a confirmation from bug reporter.

121

122 --------------------------------------------------

123 [Graduated to "master"]

124

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

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

80 - + Appease Sun Studio by renaming "tmpfile"

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 -

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 -

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 -

112 -Kept only the second one from the original.

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

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

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

128 +

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

130 + (merged to 'next' on 2011-12-28 at 8acf26e)

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

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

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

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

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

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

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

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

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

140 + + git-p4: introduce asciidoc documentation

141 + + rename git-p4 tests

142

143 --------------------------------------------------

144 [Stalled]

145

146 +* bw/maint-t8006-sed-incomplete-line (2012-01-03) 1 commit

147 + - Work around sed portability issue in t8006-blame-textconv

148 +

149 +Waiting for a clarification of the reasoning in the log message.

150 +

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

152 + - fixup! 3413d4d

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

154 + - index-pack: eliminate recursion in find_unresolved_deltas

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

156 +

157 +Expecting a reroll.

158 +

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

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

161

@@ -191,21 +233,11 @@ should never be translated.

233 --------------------------------------------------

234 [Cooking]

235

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 -

207 -Rorolled.

208 -Not urgent.

236 +* jh/fetch-head-update (2012-01-03) 1 commit

237 + (merged to 'next' on 2012-01-04 at b5778e1)

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

239 +

240 +Will merge to 'master' by 1.7.9 final.

241

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

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

@@ -214,8 +246,22 @@ Not urgent.

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

247 + log: --show-signature

248 + commit: teach --gpg-sign option

249 + (this branch is used by jc/show-sig.)

250 +

251 +The infrastructure this series adds is used by the finishing touches to

252 +the earlier "pull signed tags" topic, so this will graduate to "master"

253 +together with it when the latter matures, hopefully before 1.7.9 final.

254 +

255 +--------------------------------------------------

256 +[Discarded]

257

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.

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

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

260 + - ignore empty *_ASKPASS variables

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

262 + - switch to central prompt method

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

264

221 -Opinions?

265 +This has become more about "prompt without terminal", and was rerolled

266 +into a two-patch series, which is structured a lot nicer than this

267 +original.

What's cooking (2012/01 #01)