217580b83e · matheusbsbs/matheus-bagliano

@@ -0,0 +1,316 @@

1 +To: git@vger.kernel.org

2 +Subject: What's cooking in git.git (Feb 2009, #04; Sun, 15)

3 +X-master-at: 075394e26cd7fb38e08d5f637a5fc825ab0b3fb3

4 +X-next-at: 607872276f2e9c2cf5c5bb05e9a9a741f3792148

5 +

6 +What's cooking in git.git (Feb 2009, #04; Sun, 15)

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 +The master branch will be tagged as 1.6.2-rc1 by the end of the long

18 +weekend.

19 +

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

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

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

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

24 +won't be in the next release.

25 +

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

27 +something slightly different.

28 +

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

30 +topics that hasn't cooked to maturity by -rc1 will not be in 1.6.2 (that

31 +is what a freeze means).

32 +

33 +----------------------------------------------------------------

34 +[New Topics]

35 +

36 +* jw/imap-preformatted-html (Thu Feb 12 08:58:12 2009 -0600) 1 commit

37 + - imap.preformattedHTML to tell Thunderbird to send non-flowed text

38 +

39 +The patch text should be identical to Jeremy's "Virtual Patch", except

40 +that the configuration variable was renamed per list discussion.

41 +

42 +* jw/format-patch-attach (Thu Feb 12 09:51:55 2009 -0600) 1 commit

43 + - Enable setting attach as the default in .gitconfig for git-format-

44 + patch.

45 +

46 +* sr/force-rebase (Fri Feb 13 23:48:01 2009 +0100) 1 commit

47 + - Teach rebase to rebase even if upstream is up to date

48 +

49 +* fg/exclude-bq (Tue Feb 10 15:20:17 2009 +0100) 1 commit

50 + - Support "\" in non-wildcard exclusion entries

51 +

52 +* fc/config-editor (Sat Feb 7 23:53:00 2009 +0200) 1 commit

53 + - config: Add new option to open an editor.

54 +

55 +* dm/add-i-edit-abort (Thu Feb 12 00:19:41 2009 -0500) 1 commit

56 + - add -i: revisit hunk on editor failure

57 +

58 +* tp/completion (Wed Feb 11 13:03:26 2009 -0500) 4 commits

59 + - completion: More fixes to prevent unbound variable errors

60 + - completion: Better __git_ps1 support when not in working directory

61 + - completion: Use consistent if [...] convention, not "test"

62 + - completion: For consistency, change "git rev-parse" to __gitdir

63 + calls

64 +

65 +* js/branch-symref (Fri Feb 13 04:40:18 2009 -0500) 1 commit

66 + - builtin-branch: improve output when displaying remote branches

67 +

68 +* js/send-email (Sat Feb 14 23:32:15 2009 -0500) 3 commits

69 + - send-email: --suppress-cc improvements

70 + - send-email: handle multiple Cc addresses when reading mbox message

71 + - send-email: allow send-email to run outside a repo

72 +

73 +* al/ansi-color (Fri Feb 13 22:53:41 2009 +0100) 2 commits

74 + - builtin-branch.c: Rename branch category color names

75 + - Clean up use of ANSI color sequences

76 +

77 +All of the above are probably ready for 'next'.

78 +

79 +* js/remote-set-head (Sat Feb 14 05:30:30 2009 -0500) 5 commits

80 + - builtin-remote: better handling of multiple remote HEADs

81 + - builtin-remote: add set-head subcommand

82 + - builtin-remote: teach show to display remote HEAD

83 + - builtin-remote: move duplicated cleanup code its own function

84 + - builtin-clone: move locate_head() to remote.c so it can be re-used

85 +

86 +* jk/head-lookup (Sun Feb 15 01:18:18 2009 -0500) 5 commits

87 + - remote: use exact HEAD lookup if it is available

88 + - remote: refactor guess_remote_head

89 + - refactor find_refs_by_name to accept const list

90 + - add basic http clone/fetch tests

91 + - test scripts: refactor start_httpd helper

92 +

93 +Builds on top of Jay Soffian's js/remote-set-head topic.

94 +

95 +* sg/rerere-cleanup (Sat Feb 14 23:21:04 2009 +0100) 1 commit

96 + - rerere: remove duplicated functions

97 +

98 +* ns/stash-keep (Thu Feb 12 06:25:14 2009 +0900) 1 commit

99 + - stash: --keep option just saves

100 +

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

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

103 +

104 +----------------------------------------------------------------

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

106 +

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

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

109 +

110 +Discussion stalled on the submodule selection criteria.

111 +

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

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

114 + format

115 + + git-blame: refactor code to emit "porcelain format" output

116 +

117 +This gives Porcelains (like gitweb) the information on the commit _before_

118 +the one that the final blame is laid on, which should save them one

119 +rev-parse to dig further. The line number in the "previous" information

120 +may need refining, and sanity checking code for reference counting may

121 +need to be resurrected before this can move forward.

122 +

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

124 +

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

126 + - Support fetching from foreign VCSes

127 + - Add specification of git-vcs helpers

128 + - Add "vcs" config option in remotes

129 +

130 +The "spec" did not seem quite well cooked yet, but in the longer term I

131 +think something like this to allow interoperating with other SCMs as if

132 +the other end is a native git repository is a very worthy goal.

133 +

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

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

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

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

138 + - Add new "git replace" command

139 + - environment: add global variable to disable replacement

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

141 + - replace_object: add a test case

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

143 + - sha1_file: add a "read_sha1_file_repl" function

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

145 + "refs/replace/"

146 + - refs: add a "for_each_replace_ref" function

147 +

148 +I think the code is much cleaner than the first round, but I am not

149 +convinced it is doing the right thing in the connectivity traverser.

150 +I'd like to keep this out of 1.6.2.

151 +

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

153 + - gitweb: Optional grouping of projects by category

154 + - gitweb: Split git_project_list_body in two functions

155 + - gitweb: Modularized git_get_project_description to be more generic

156 +

157 +Design discussion between Jakub and Sebastien seems to have stalled.

158 +

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

160 + - fsck: three levels of validation

161 + - verify-pack: add --quick

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

163 + version 2 idx

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

165 +

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

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

168 +experiment.

169 +

170 +----------------------------------------------------------------

171 +[Reverted]

172 +

173 +* mh/unify-color (Fri Jan 23 01:25:23 2009 -0800) 3 commits

174 + ? Revert previous two commits

175 + ? move the color variables to color.c

176 + ? handle color.ui at a central place

177 +

178 +This broke git-format-patch badly.

179 +

180 +* js/rebase-error-a-bit-more-verbose (Sun Feb 8 21:22:18 2009 -0800) 2 commits

181 + ? Revert "rebase: explain why when the HEAD could not be detached"

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

183 +

184 +This turned out to be unnecessary.

185 +

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

187 + ? Revert "fix t1504 on Windows"

188 + ? fix t1504 on Windows

189 +

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

191 +

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

193 + ? Revert round #1 of the series

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

195 + ? archive.c: enable traversal of submodules

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

197 +

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

199 +

200 +----------------------------------------------------------------

201 +[Actively cooking]

202 +

203 +* kb/checkout-optim (Mon Feb 9 21:54:53 2009 +0100) 9 commits

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

205 + types

206 + - show_patch_diff(): remove a call to fstat()

207 + - write_entry(): use fstat() instead of lstat() when file is open

208 + - write_entry(): cleanup of some duplicated code

209 + - create_directories(): remove some memcpy() and strchr() calls

210 + - unlink_entry(): introduce schedule_dir_for_removal()

211 + - lstat_cache(): swap func(length, string) into func(string, length)

212 + - lstat_cache(): generalise longest_match_lstat_cache()

213 + - lstat_cache(): small cleanup and optimisation

214 +

215 +Should be ready for 'next'.

216 +

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

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

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

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

221 + + Add a script to coalesce the valgrind outputs

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

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

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

225 + + valgrind: ignore ldso and more libz errors

226 + + Add valgrind support in test scripts

227 +

228 +----------------------------------------------------------------

229 +[Graduated to "master"]

230 +

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

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

233 +

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

235 + + Remove unused normalize_absolute_path()

236 + + Test and fix normalize_path_copy()

237 + + Fix GIT_CEILING_DIRECTORIES on Windows

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

239 + normalize_path_copy()

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

241 +

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

243 +

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

245 + + submodule: warn about non-submodules

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

247 +

248 +* ms/mailmap (Thu Feb 8 15:34:31 2009 +0100) 5 commits

249 + + Move mailmap documentation into separate file

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

251 + of author/committer.

252 + + Add map_user() and clear_mailmap() to mailmap

253 + + Add find_insert_index, insert_at_index and clear_func functions to

254 + string_list

255 + + Add log.mailmap as configurational option for mailmap location

256 +

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

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

259 +

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

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

262 + tree

263 +

264 +----------------------------------------------------------------

265 +[On Hold]

266 +

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

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

269 + push

270 +

271 +This is for 1.7.0.

272 +

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

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

275 + merge

276 + - builtin-commit: shorten eye-sore overlong lines

277 + - Add "partial commit" tests during a conflicted merge

278 +

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

280 +

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

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

283 +

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

285 +

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

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

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

289 +data in the canonical repository representation.

290 +

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

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

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

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

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

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

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

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

299 +in binary mode as well.

300 +

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

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

303 + asked for

304 +

305 +* jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits

306 + . git-am --forge: add Signed-off-by: line for the author

307 + . git-am: clean-up Signed-off-by: lines

308 + . stripspace: add --log-clean option to clean up signed-off-by:

309 + lines

310 + . stripspace: use parse_options()

311 + . Add "git am -s" test

312 + . git-am: refactor code to add signed-off-by line for the committer

313 +

314 +* jc/post-simplify (Fri Aug 15 01:34:51 2008 -0700) 2 commits

315 + . revision --simplify-merges: incremental simplification

316 + . revision --simplify-merges: prepare for incremental simplification