a0536021e1 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Feb 2009, #02; Wed, 04)

3 -X-master-at: 88ccb9f9745ff1f44bff7c6d6c17ad4b46870706

4 -X-next-at: c5d3fa64fe3170d80a48f5c5b99f14dbabcbd9b4

2 +Subject: What's cooking in git.git (Feb 2009, #03; Sat, 07)

3 +X-master-at: 621f1b4bcf40f1469fc59202248df35619e33c82

4 +X-next-at: 5e148c2bfc7eda43fad0646e9583a9959b15bb2a

5

6 -What's cooking in git.git (Feb 2009, #02; Wed, 04)

6 +What's cooking in git.git (Feb 2009, #03; Sat, 07)

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

8

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

@@ -14,60 +14,66 @@ holding onto them.

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 -I was this close (shows thumb and index finger almost touching) to merge

18 -js/notes to master and declare 1.6.2-rc0 but decided against it, because I

19 -thought I need to at least have heard about somebody who used it before

20 -doing so. Perhaps I'll try it out myself to keep track of commits that

21 -happened between 1.6.1 and master that need to be cherry-picked to maint,

22 -or something silly like that. In any case, my prediction is that -rc0

23 -would look like what 'next' tonight looks like, nothing more, not much

24 -less (I'd probably drop jc/blame).

17 +The master branch is at -rc0 now.

18 +

19 +Traditionally, rc freeze, especially post -rc1, meant that I stop paying

20 +attention to whatever topic that did not graduate to 'master', and not

21 +queuing further updates to 'next' to encourage people to concentrate on

22 +'master' bugfixes by discouraging them from tinkering the topics that

23 +won't be in the next release.

24 +

25 +I do not think that approach has worked well in practice, so let's try

26 +something slightly different.

27 +

28 +I'll try to leave 'next' open during this freeze, but the new topics and

29 +topics that hasn't cooked to maturity by -rc1 will not be in 1.6.2. That

30 +is what a freeze means, so it may not be necessary to say so, but I am

31 +just trying to make it clear.

32

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

34 [New Topics]

35

29 -* jc/refuse-push-to-current-1.7.0 (Sat Jan 31 17:34:05 2009 -0800) 1 commit

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

31 - push

36 +* jn/gitweb-committag (Fri Feb 6 10:12:41 2009 +0100) 1 commit

37 + + gitweb: Better regexp for SHA-1 committag match

38

33 -This is for 1.7.0.

39 +* js/maint-1.6.0-path-normalize (Sat Feb 7 16:08:31 2009 +0100) 5 commits

40 + + Remove unused normalize_absolute_path()

41 + + Test and fix normalize_path_copy()

42 + + Fix GIT_CEILING_DIRECTORIES on Windows

43 + + Move sanitary_path_copy() to path.c and rename it to

44 + normalize_path_copy()

45 + + Make test-path-utils more robust against incorrect use

46

35 -* js/maint-remote-remove-mirror (Wed Feb 4 11:06:07 2009 -0500) 2 commits

36 - + builtin-remote: make rm operation safer in mirrored repository

37 - + builtin-remote: make rm() use properly named variable to hold

38 - return value

39 -

40 -* ek/maint-filter-branch-bare (Tue Feb 3 13:27:03 2009 -0500) 1 commit

41 - + filter-branch: Fix fatal error on bare repositories

47 +Replaces one from René that was queued earlier.

48

43 -* tr/add-p-single (Wed Feb 4 21:12:39 2009 +0100) 2 commits

44 - - add -p: print errors in separate color

45 - - add -p: prompt for single characters

49 +* js/git-submodule-trailing-slash (Sat Feb 7 14:43:15 2009 +0100) 2 commits

50 + + submodule: warn about non-submodules

51 + + Let ls-files strip trailing slashes in submodules' paths

52

47 -Will move to 'next'; it may or may not mature in time for 1.6.2.

53 +* ms/mailmap (Thu Feb 5 09:06:41 2009 +0100) 4 commits

54 + - Change current mailmap usage to do matching on both name and email

55 + of author/committer.

56 + - Add map_user() and clear_mailmap() to mailmap

57 + - Add find_insert_index, insert_at_index and clear_func functions to

58 + string_list

59 + - Add log.mailmap as configurational option for mailmap location

60

49 -----------------------------------------------------------------

50 -[Stalled and may need help and prodding to go forward]

61 +* ff/submodule-no-fetch (Thu Feb 5 20:18:32 2009 -0200) 1 commit

62 + - submodule: add --no-fetch parameter to update command

63

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

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

64 +* mc/setup-cd-p (Fri Feb 6 19:24:28 2009 -0800) 1 commit

65 + - git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work

66 + tree

67

55 -This is a feature waiting for a user. I do not need it in 1.6.2

68 +* js/rebase-error-a-bit-more-verbose (Sat Feb 7 18:20:09 2009 +0100) 1 commit

69 + + rebase: explain why when the HEAD could not be detached

70

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

58 -using for merging is for this path, so use the core.autocrlf and attributes

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

60 -data in the canonical repository representation.

71 +All of these looked sensible, and I think many deserve to be in 1.6.2.

72 +They are not in -rc0 only because I started the release engineering before

73 +they arrived.

74

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

63 -files (preimage, postimage and thisimage) from the work tree in the work

64 -tree representation, merges them without converting them to the canonical

65 -representation first but inserts the conflict markers with the canonical

66 -representation and writes the resulting mess out. It needs to be fixed to

67 -read with convert_to_git(), merge them while they are still in the

68 -canonical representation and possibly add conflict markers, and then write

69 -the results out after convert_to_working_tree(). It also needs to write

70 -in binary mode as well.

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

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

77

78 * jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits

79 + blame: show "previous" information in --porcelain/--incremental

@@ -80,6 +86,8 @@ rev-parse to dig further. The line number in the "previous" information

86 may need refining, and sanity checking code for reference counting may

87 need to be resurrected before this can move forward.

88

89 +Recent tig discussion may blow new life into it. Let's see.

90 +

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

92 - Support fetching from foreign VCSes

93 - Add specification of git-vcs helpers

@@ -107,20 +115,6 @@ I think the code is much cleaner than the first round, but I am not

115 convinced it is doing the right thing in the connectivity traverser.

116 I'd like to keep this out of 1.6.2.

117

110 -* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 6 commits

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

112 - - tree.c: allow read_tree_recursive() to traverse gitlink entries

113 - + Revert round #1 of the series

114 - + builtin-ls-tree: enable traversal of submodules

115 - + archive.c: enable traversal of submodules

116 - + tree.c: add support for traversal of submodules

117 -

118 -Sorry, but what's the status of this one? I am not particularly

119 -interested in this new feature myself, so unless I hear otherwise from

120 -people, I'd like to keep this out of 1.6.2. That would have the added

121 -benefit of being able to discard the first four that is already in 'next'

122 -to get a fresh start post 1.6.2 ;-)

123 -

118 * sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits

119 - gitweb: Optional grouping of projects by category

120 - gitweb: Split git_project_list_body in two functions

@@ -128,6 +122,17 @@ to get a fresh start post 1.6.2 ;-)

122

123 Design discussion between Jakub and Sebastien seems to have stalled.

124

125 +* jc/fsck (Fri Jan 30 02:33:47 2009 -0800) 4 commits

126 + - fsck: three levels of validation

127 + - verify-pack: add --quick

128 + - verify_pack(): allow a quicker verification for a pack with

129 + version 2 idx

130 + - pack-check.c: minor formatting fix to match coding style

131 +

132 +J6t has a good point that if this had any value then medium level should

133 +replace the default. I am tempted to actually dropping this as a failed

134 +experiment.

135 +

136 ----------------------------------------------------------------

137 [Reverted]

138

@@ -138,20 +143,31 @@ Design discussion between Jakub and Sebastien seems to have stalled.

143

144 This broke git-format-patch badly.

145

146 +* rs/maint-1.6.0-windows-ceiling (Sat Feb 7 12:40:40 2009 -0800) 2 commits

147 + ? Revert "fix t1504 on Windows"

148 + ? fix t1504 on Windows

149 +

150 +I'm giving a fresh start to J6t's series which contains this.

151 +

152 +* lh/reverted-submodule-tree-traversal (Sun Jan 25 18:39:55 2009 -0800) 4 commits

153 + ? Revert round #1 of the series

154 + ? builtin-ls-tree: enable traversal of submodules

155 + ? archive.c: enable traversal of submodules

156 + ? tree.c: add support for traversal of submodules

157 +

158 +I'm giving a fresh start to Lars's second iteration.

159 +

160 ----------------------------------------------------------------

161 [Actively cooking]

162

144 -* jc/fsck (Fri Jan 30 02:44:13 2009 -0800) 5 commits

145 - - fsck: revert --quick to the default and introduce --medium

146 - - fsck: three levels of validation

147 - - verify-pack: add --quick

148 - - verify_pack(): allow a quicker verification for a pack with

149 - version 2 idx

150 - - pack-check.c: minor formatting fix to match coding style

163 +* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 2 commits

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

165 + + tree.c: allow read_tree_recursive() to traverse gitlink entries

166

152 -I haven't heard anything positive nor negative about this series. I think

153 -the tip two commits should be squashed (and perhaps the option parser

154 -cleaned up as suggested on the list).

167 +I think the first one is Ok to have in 1.6.2 but I didn't audit all the

168 +r-t-r callback functions myself to make sure they do not return

169 +READ_TREE_RECURSIVE when they shouldn't. Perhaps somebody else should

170 +double check.

171

172 * kb/checkout-optim (Wed Feb 4 13:53:20 2009 +0100) 8 commits

173 - lstat_cache(): print a warning if doing ping-pong between cache

@@ -164,19 +180,34 @@ cleaned up as suggested on the list).

180 - lstat_cache(): generalise longest_match_lstat_cache()

181 - lstat_cache(): small cleanup and optimisation

182

167 -Should be in 'next' soon.

183 +I thought it looked fine, but Kjetil asks to cook this a bit longer.

184

169 -* js/valgrind (Wed Feb 4 00:26:31 2009 +0100) 8 commits

170 - - test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH

171 - - Tests: let --valgrind imply --verbose and --tee

172 - - Add a script to coalesce the valgrind outputs

173 - - t/Makefile: provide a 'valgrind' target

174 - - test-lib.sh: optionally output to test-results/$TEST.out, too

175 - - Valgrind support: check for more than just programming errors

176 - - valgrind: ignore ldso and more libz errors

177 - - Add valgrind support in test scripts

185 +* js/valgrind (Thu Feb 5 22:03:00 2009 +0100) 9 commits

186 + + valgrind: do not require valgrind 3.4.0 or newer

187 + + test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH

188 + + Tests: let --valgrind imply --verbose and --tee

189 + + Add a script to coalesce the valgrind outputs

190 + + t/Makefile: provide a 'valgrind' target

191 + + test-lib.sh: optionally output to test-results/$TEST.out, too

192 + + Valgrind support: check for more than just programming errors

193 + + valgrind: ignore ldso and more libz errors

194 + + Add valgrind support in test scripts

195 +

196 +----------------------------------------------------------------

197 +[Graduated to "master"]

198 +

199 +* js/maint-remote-remove-mirror (Wed Feb 4 11:06:07 2009 -0500) 2 commits

200 + + builtin-remote: make rm operation safer in mirrored repository

201 + + builtin-remote: make rm() use properly named variable to hold

202 + return value

203 +

204 +* ek/maint-filter-branch-bare (Tue Feb 3 13:27:03 2009 -0500) 1 commit

205 + + filter-branch: Fix fatal error on bare repositories

206

179 -Should be in 'next' soon.

207 +* tr/add-p-single (Fri Feb 6 20:30:01 2009 +0100) 3 commits

208 + + add -p: import Term::ReadKey with 'require'

209 + + add -p: print errors in separate color

210 + + add -p: prompt for single characters

211

212 * js/notes (Tue Jan 13 20:57:16 2009 +0100) 6 commits

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

@@ -186,35 +217,6 @@ Should be in 'next' soon.

217 + Add a script to edit/inspect notes

218 + Introduce commit notes

219

189 -It would be nice to hear a real world success story using the notes

190 -mechanism; Dscho says he also wants to make sure the current choice

191 -of the structure scales well before casting it in stone, but nothing

192 -has happened since then.

193 -

194 -----------------------------------------------------------------

195 -[Graduated to "master"]

196 -

197 -* wp/add-patch-find (Thu Nov 27 04:08:03 2008 +0000) 3 commits

198 - + In add --patch, Handle K,k,J,j slightly more gracefully.

199 - + Add / command in add --patch

200 - + git-add -i/-p: Change prompt separater from slash to comma

201 -

202 -* jc/maint-add-u-remove-conflicted (Wed Jan 28 14:24:53 2009 -0800) 1 commit

203 - + add -u: do not fail to resolve a path as deleted

204 -

205 -* jk/maint-cleanup-after-exec-failure (Wed Jan 28 02:38:14 2009 -0500) 4 commits

206 - + git: use run_command() to execute dashed externals

207 - + run_command(): help callers distinguish errors

208 - + run_command(): handle missing command errors more gracefully

209 - + git: s/run_command/run_builtin/

210 -

211 -* ns/am-slacker (Sat Jan 24 10:18:02 2009 +0900) 2 commits

212 - + git-am: Add --ignore-date option

213 - + am: Add --committer-date-is-author-date option

214 -

215 -----------------------------------------------------------------

216 -[Will merge to "master" soon]

217 -

220 * gt/utf8-width (Fri Jan 30 04:41:29 2009 -0500) 2 commits

221 + builtin-blame.c: Use utf8_strwidth for author's names

222 + utf8: add utf8_strwidth()

@@ -228,8 +230,6 @@ if you remove .mailmap).

230 + symbolic ref: refuse non-ref targets in HEAD

231 + validate_headref: tighten ref-matching to just branches

232

231 -Looked fine for 1.6.2.

232 -

233 * rc/http-push (Tue Feb 3 20:39:00 2009 +0800) 4 commits

234 + http-push: wrap signature of get_remote_object_url

235 + http-push: add back underscore separator before lock token

@@ -237,21 +237,10 @@ Looked fine for 1.6.2.

237 USE_CURL_MULTI

238 + http-push: refactor request url creation

239

240 -As these are supposed to be only clean-ups without any functionality

241 -change, let's flush it out before 1.6.2.

242 -

240 * jc/refuse-push-to-current (Sat Jan 31 17:34:05 2009 -0800) 1 commit

241 + receive-pack: explain what to do when push updates the current

242 branch

243

247 -This prepares to finally switch the default for receive.denyCurrentBranch

248 -to "refuse". The idea is to issue a big warning to people who push into

249 -currently checked out branch when the configuration is unset and we

250 -default to "warn", and explain in detail (1) why it is not likely to be

251 -what they want to do (to help new people), (2) if it is what they want,

252 -how to squelch that annoyingly long message, and (3) the default will be

253 -changed to "refuse" in a future release of git.

254 -

244 * cb/mergetool (Fri Jan 30 23:20:11 2009 +0000) 3 commits

245 + mergetool: fix running mergetool in sub-directories

246 + mergetool: Add a test for running mergetool in a sub-directory

@@ -260,6 +249,12 @@ changed to "refuse" in a future release of git.

249 ----------------------------------------------------------------

250 [On Hold]

251

252 +* jc/refuse-push-to-current-1.7.0 (Sat Jan 31 17:34:05 2009 -0800) 1 commit

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

254 + push

255 +

256 +This is for 1.7.0.

257 +

258 * jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits

259 - git commit: pathspec without -i/-o implies -i semantics during a

260 merge

@@ -268,6 +263,26 @@ changed to "refuse" in a future release of git.

263

264 This is only meant as a weatherballoon to help facilitate discussion.

265

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

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

268 +

269 +This is a feature waiting for a user. I do not need it in 1.6.2

270 +

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

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

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

274 +data in the canonical repository representation.

275 +

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

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

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

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

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

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

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

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

284 +in binary mode as well.

285 +

286 * jk/renamelimit (Sat May 3 13:58:42 2008 -0700) 1 commit

287 . diff: enable "too large a rename" warning when -M/-C is explicitly

288 asked for

What's cooking (2009/02 #03)