37eea2f665 · matheusbsbs/matheus-bagliano

@@ -0,0 +1,282 @@

1 +To: git@vger.kernel.org

2 +Subject: What's cooking in git.git (Mar 2009, #06; Sat, 21)

3 +X-master-at: a797b02f3925c4a6324472e2edaf4a58d4ffc097

4 +X-next-at: 5572a388cef2195e61894eec7976411776a95b39

5 +

6 +What's cooking in git.git (Mar 2009, #06; Sat, 21)

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'. The ones

11 +marked with '.' do not appear in any of the branches, but I am still

12 +holding onto them.

13 +

14 +The topics list the commits in reverse chronological order. The topics

15 +meant to be merged to the maintenance series have "maint-" in their names.

16 +

17 +----------------------------------------------------------------

18 +[New Topics]

19 +

20 +* jk/reflog-date (Fri Mar 20 02:00:43 2009 -0400) 1 commit

21 + - make oneline reflog dates more consistent with multiline format

22 +

23 +* js/maint-1.6.0-exec-path-env (Wed Mar 18 08:42:53 2009 +0100) 1 commit

24 + - export GIT_EXEC_PATH when git is run with --exec-path

25 +

26 +* da/difftool (Thu Mar 19 01:25:25 2009 -0700) 1 commit

27 + - difftool: move 'git-difftool' out of contrib

28 +

29 +* jc/maint-1.6.0-keep-pack (Thu Mar 19 22:47:54 2009 -0500) 4 commits

30 + - Remove --kept-pack-only option and associated infrastructure

31 + - pack-objects: only repack or loosen objects residing in "local"

32 + packs

33 + - git-repack.sh: don't use --kept-pack-only option to pack-objects

34 + - t7700-repack: add two new tests demonstrating repacking flaws

35 +

36 +Brandon Casey fixed the regression previous patches introduced; thanks.

37 +

38 +* jc/maint-1.6.0-blame-s (Wed Mar 18 00:13:03 2009 -0700) 1 commit

39 + - blame: read custom grafts given by -S before calling

40 + setup_revisions()

41 +

42 +The above are all ready for 'next'.

43 +

44 +* hv/cvsps-tests (Wed Mar 18 18:33:41 2009 +0100) 7 commits

45 + - cvsimport: extend testcase about patchset order to contain

46 + branches

47 + - cvsimport: add test illustrating a bug in cvsps

48 + - Add a test of "git cvsimport"'s handling of tags and branches

49 + - Add some tests of git-cvsimport's handling of vendor branches

50 + - Test contents of entire cvsimported "master" tree contents

51 + - Use CVS's -f option if available (ignore user's ~/.cvsrc file)

52 + - Start a library for cvsimport-related tests

53 +

54 +Two cvsimport test topics were rewound from 'next' and merged into this

55 +one. I'll keep this in 'pu' so that people can polish their cvsps skilz

56 +to resolve issues these tests identify.

57 +

58 +----------------------------------------------------------------

59 +[Graduated to "master"]

60 +

61 +* fc/parseopt-config (Tue Mar 17 10:46:37 2009 +0100) 10 commits

62 + + config: test for --replace-all with one argument and fix

63 + documentation.

64 + + config: set help text for --bool-or-int

65 + + git config: don't allow --get-color* and variable type

66 + + git config: don't allow extra arguments for -e or -l.

67 + + git config: don't allow multiple variable types

68 + + git config: don't allow multiple config file locations

69 + + git config: reorganize to use parseopt

70 + + git config: reorganize get_color*

71 + + git config: trivial rename in preparation for parseopt

72 + + git_config(): not having a per-repo config file is not an error

73 +

74 +* js/rebase-i-opt (Tue Mar 3 10:55:31 2009 +0100) 1 commit

75 + + rebase -i: avoid 'git reset' when possible

76 +

77 +* jc/clone-branch-rebase (Tue Mar 10 01:20:42 2009 -0700) 2 commits

78 + + Improve "git branch --tracking" output

79 + + Make git-clone respect branch.autosetuprebase

80 +

81 +This is a rewrite of a patch from Pat Notz.

82 +

83 +* xx/db-refspec-vs-js-remote (Sun Mar 8 00:12:33 2009 -0800) 1 commit

84 + + Adjust js/remote-improvements and db/refspec-wildcard-in-the-

85 + middle

86 +

87 +* db/refspec-wildcard-in-the-middle (Sat Mar 7 01:11:39 2009 -0500) 5 commits

88 + + Support '*' in the middle of a refspec

89 + + Keep '*' in pattern refspecs

90 + + Use the matching function to generate the match results

91 + + Use a single function to match names against patterns

92 + + Make clone parse the default refspec with the normal code

93 +

94 +* bw/autoconf (Thu Mar 12 15:20:12 2009 -0400) 7 commits

95 + + configure: rework pthread handling to allow for user defined flags

96 + + configure: make iconv tests aware of user arguments

97 + + configure: asciidoc version test cleanup

98 + + configure: wrap some library tests with GIT_STASH_FLAGS

99 + + configure: add macros to stash FLAG variables

100 + + configure: reorganize flow of argument checks

101 + + configure: ensure settings from user are also usable in the script

102 +

103 +* mv/parseopt-ls-files (Sat Mar 7 20:27:22 2009 -0500) 4 commits

104 + + ls-files: fix broken --no-empty-directory

105 + + t3000: use test_cmp instead of diff

106 + + parse-opt: migrate builtin-ls-files.

107 + + Turn the flags in struct dir_struct into a single variable

108 +

109 +The tip one was a subject for further discussion, but nothing is queued

110 +yet.

111 +

112 +----------------------------------------------------------------

113 +[Will merge to 'master' soon]

114 +

115 +* dm/maint-docco (Thu Mar 19 20:35:34 2009 -0700) 6 commits

116 + + Documentation: reword example text in git-bisect.txt.

117 + + Documentation: reworded the "Description" section of git-

118 + bisect.txt.

119 + + Documentation: minor grammatical fixes in git-branch.txt.

120 + + Documentation: minor grammatical fixes in git-blame.txt.

121 + + Documentation: reword the "Description" section of git-bisect.txt.

122 + + Documentation: minor grammatical fixes in git-archive.txt.

123 +

124 +* mg/test-installed (Mon Mar 16 18:03:12 2009 +0100) 2 commits

125 + + test-lib.sh: Allow running the test suite against installed git

126 + + test-lib.sh: Test for presence of git-init in the right path.

127 +

128 +----------------------------------------------------------------

129 +[Discarded]

130 +

131 +* hv/cvsimport-tests (Mon Mar 2 18:59:36 2009 +0100) 1 commit

132 + ? cvsimport: add test illustrating a bug in cvsps

133 +

134 +* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits

135 + ? Add a test of "git cvsimport"'s handling of tags and branches

136 + ? Add some tests of git-cvsimport's handling of vendor branches

137 + ? Test contents of entire cvsimported "master" tree contents

138 + ? Use CVS's -f option if available (ignore user's ~/.cvsrc file)

139 + ? Start a library for cvsimport-related tests

140 +

141 +----------------------------------------------------------------

142 +[Stalled and may need help and prodding to go forward]

143 +

144 +* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit

145 + - blame.c: start libifying the blame infrastructure

146 +

147 +A few minor point remains in this initial one.

148 +

149 +* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit

150 + - Allow --date=local --date=other-format to work as expected

151 +

152 +The one I posted had a few corner-case bugs that was caught with the test

153 +suite; this one has them fixed. People did not like the UI so it is kept

154 +out of 'next'

155 +

156 +* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit

157 + - archive.c: add support for --submodules[=(all|checkedout)]

158 +

159 +Discussion stalled on the submodule selection criteria.

160 +Probably I should discard it and wait for a reroll if needed.

161 +

162 +* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit

163 + - git-merge-file: allow converting the results for the work tree

164 +

165 +This is a feature waiting for a user.

166 +

167 +We did not give scripted Porcelains a way to say "this temporary file I am

168 +using for merging is for this path, so use the core.autocrlf and attributes

169 +rules for that final path". Instead, merge-file simply wrote out the

170 +data in the canonical repository representation.

171 +

172 +rerere has the same issue, but it is a lot worse. It reads the three

173 +files (preimage, postimage and thisimage) from the work tree in the work

174 +tree representation, merges them without converting them to the canonical

175 +representation first but inserts the conflict markers with the canonical

176 +representation and writes the resulting mess out. It needs to be fixed to

177 +read with convert_to_git(), merge them while they are still in the

178 +canonical representation and possibly add conflict markers, and then write

179 +the results out after convert_to_working_tree(). It also needs to write

180 +in binary mode as well.

181 +

182 +* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits

183 + - Support fetching from foreign VCSes

184 + - Add specification of git-vcs helpers

185 + - Add "vcs" config option in remotes

186 +

187 +Daniel seems to have a plan for going forward with this series.

188 +

189 +* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits

190 + - builtin-replace: use "usage_msg_opt" to give better error messages

191 + - parse-options: add new function "usage_msg_opt"

192 + - builtin-replace: teach "git replace" to actually replace

193 + - Add new "git replace" command

194 + - environment: add global variable to disable replacement

195 + - mktag: call "check_sha1_signature" with the replacement sha1

196 + - replace_object: add a test case

197 + - object: call "check_sha1_signature" with the replacement sha1

198 + - sha1_file: add a "read_sha1_file_repl" function

199 + - replace_object: add mechanism to replace objects found in

200 + "refs/replace/"

201 + - refs: add a "for_each_replace_ref" function

202 +

203 +I know, I really have to drop everything else and re-read these, but I

204 +haven't managed to.

205 +

206 +* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits

207 + - tests: fix "export var=val"

208 + - notes: refuse to edit notes outside refs/notes/

209 + - t3301: use test_must_fail instead of !

210 + - t3301: fix confusing quoting in test for valid notes ref

211 + - notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR

212 + - notes: only clean up message file when editing

213 + - handle empty notes gracefully

214 + - git notes show: test empty notes

215 + - git-notes: fix printing of multi-line notes

216 + - notes: fix core.notesRef documentation

217 + - Add an expensive test for git-notes

218 + - Speed up git notes lookup

219 + - Add a script to edit/inspect notes

220 + - Introduce commit notes

221 +

222 +----------------------------------------------------------------

223 +[Actively cooking]

224 +

225 +* jc/attributes-checkout (Fri Mar 20 10:32:09 2009 +0100) 2 commits

226 + - Add a test for checking whether gitattributes is honored by

227 + checkout.

228 + - Read attributes from the index that is being checked out

229 +

230 +Original issue identified, and test provided by Kristian Amlie.

231 +

232 +* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits

233 + - Display warning for default git push with no push.default config

234 + + New config push.default to decide default behavior for push

235 +

236 +Replaced the old series with the first step to allow a smooth transition.

237 +Some might argue that this should not give any warning but just give users

238 +this new configuration to play with first, and after we know we are going

239 +to switch default some day, start the warning.

240 +

241 +* mg/http-auth (Wed Mar 18 18:46:41 2009 -0500) 6 commits

242 + + http-push.c: use a faux remote to pass to http_init

243 + + Do not name "repo" struct "remote" in push_http.c

244 + + http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient

245 + versions of cURL

246 + + http authentication via prompts

247 + + http_init(): Fix config file parsing

248 + + http.c: style cleanups

249 +

250 +Amos King added push side support on top of my fetch side support.

251 +

252 +We may want to also pass --remote parameter from git-push to this backend

253 +as Daniel did as an interim solution for the fetch side, so that we can

254 +handle the configuration better.

255 +

256 +* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits

257 + + Move push matching and reporting logic into transport.c

258 + + Use a common function to get the pretty name of refs

259 +

260 +* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit

261 + + stat_tracking_info(): only count real commits

262 +

263 +This gives the merge commits zero weight when talking about how many

264 +commits you have ahead (or behind) of the branch you are tracking. Even

265 +though I agree that they should carry much less weight than the "real"

266 +commits, because your repeated merge from the other branch does not really

267 +add any real value to the end result, giving them absolute zero weight

268 +somehow feels wrong. At least it shows that your have been _active_ on the

269 +branch. But I do not feel very strongly about it.

270 +

271 +----------------------------------------------------------------

272 +[On Hold]

273 +

274 +* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit

275 + - receive-pack: default receive.denyDeleteCurrent to refuse

276 +

277 +* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit

278 + - Refuse updating the current branch in a non-bare repository via

279 + push

280 +

281 +These are for 1.7.0, but the messages when they trigger together may need

282 +to be rethought.