ce206b4656 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Feb 2009, #01; Sun, 01)

3 -X-master-at: 2ea3c17189bf9ca459879129ca190792b5451f05

4 -X-next-at: 5bad675db98a79d08ce5abadd3347d829c6c5b36

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

3 +X-master-at: 88ccb9f9745ff1f44bff7c6d6c17ad4b46870706

4 +X-next-at: c5d3fa64fe3170d80a48f5c5b99f14dbabcbd9b4

5

6 -What's cooking in git.git (Feb 2009, #01; Sun, 01)

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

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

8

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

@@ -14,87 +14,37 @@ 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).

25 +

26 ----------------------------------------------------------------

27 [New Topics]

28

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

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

22 - - utf8: add utf8_strwidth()

23 -

24 -I am not sure if utf8_strwidth() behaves sensibly when fed a non-UTF8

25 -string (a possible failure mode is utf8_width() says "no" and it returns

26 -0, resulting in width of all zero and causing division by zero somewhere

27 -downstream, or something silly like that), but other than that, I do not

28 -think it would hurt, and will actively improve the current code.

29 -

30 -* jc/refuse-push-to-current (Sat Jan 31 17:34:05 2009 -0800) 2 commits

31 - - Set receive.denyCurrentBranch to true in a new non-bare repository

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

33 - branch

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

32

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

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

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

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

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

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

41 -changed to "refuse" in a future release of git. The tip commit also sets

42 -the configuration to refuse in a newly created repository, but with a

43 -twist. People who get the "refusal" configuration this way may be

44 -expecting the recipe they picked up to push into a live repository,

45 -perhaps a website, and let its post-update hook to "reset --hard" the

46 -deployment, and we will explain that (1) it will no longer work (because

47 -we default to "refuse" in a newly created repository), (2) how to

48 -configure it to work again, and (3) how to squelch the annoying message.

49 -

50 -I personally do not think anything short of an approach like this would

51 -work without a huge fallout like we had when yanked git-foo commands from

52 -people's $PATH in 1.6.0, but I can still be pursuaded by a better

53 -alternative, and that is why they are not in 'next' yet. Saying "old

54 -timers can flip a single switch just once" is not a better alternative, as

55 -I explained already.

56 -

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

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

59 - - fsck: three levels of validation

60 - - verify-pack: add --quick

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

62 - version 2 idx

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

64 - + fsck: check loose objects from alternate object stores by default

65 - + fsck: HEAD is part of refs

33 +This is for 1.7.0.

34

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

68 -consider the bottom two changes are pure bugfixes and should probably be

69 -in 1.6.2.

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

71 -I think the tip two commits should be squashed (and perhaps the option

72 -parser cleaned up as suggested on the list) if we were to take the

73 -remainder.

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

42

75 -* rc/http-push (Sat Jan 31 07:51:55 2009 +0800) 1 commit

76 - + http-push: refactor request url creation

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

46

78 -Looked fine for 1.6.2.

79 -

80 -* jk/head-symref (Thu Jan 29 03:33:02 2009 -0500) 2 commits

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

82 - + validate_headref: tighten ref-matching to just branches

83 -

84 -Looked fine for 1.6.2.

85 -

86 -* kb/checkout-optim (Sun Feb 1 21:23:39 2009 +0100) 7 commits

87 - - unpack-trees.c: introduce schedule_dir_for_removal()

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

89 - types

90 - - combine-diff.c: remove a call to fstat() inside show_patch_diff()

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

92 - - cleanup of write_entry() in entry.c

93 - - remove some memcpy() and strchr() calls inside

94 - create_directories()

95 - - symlinks.c: small cleanup and optimisation

96 -

97 -Love to have in 1.6.2

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

48

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

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

@@ -191,27 +141,42 @@ This broke git-format-patch badly.

141 ----------------------------------------------------------------

142 [Actively cooking]

143

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

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

196 - + Add / command in add --patch

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

198 -

199 -I think this is Ok to have in 1.6.2

200 -

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

202 - - mergetool: fix running mergetool in sub-directories

203 - - mergetool: Add a test for running mergetool in a sub-directory

204 - + mergetool: respect autocrlf by using checkout-index

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

151

206 -The fix to its subdirectory behaviour looked somewhat iffy and may have a

207 -potential for cleaning up. But we should have it in 1.6.2.

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

155

209 -* js/valgrind (Wed Jan 21 02:36:40 2009 +0100) 2 commits

210 - - valgrind: ignore ldso errors

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

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

158 + types

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

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

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

162 + - unlink_entry(): introduce schedule_dir_for_removal()

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

164 + - lstat_cache(): generalise longest_match_lstat_cache()

165 + - lstat_cache(): small cleanup and optimisation

166 +

167 +Should be in 'next' soon.

168 +

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

178

213 -Dscho and Peff had further exchanges on the list; I am sort of waiting for

214 -the conclusion before picking any intermediate version up.

179 +Should be in 'next' soon.

180

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

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

@@ -223,90 +188,19 @@ the conclusion before picking any intermediate version up.

188

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

226 -of the structure scales well before casting it in stone.

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

231 -* jc/maint-1.6.0-split-diff-metainfo (Mon Jan 26 00:08:24 2009 -0800) 1 commit

232 - + diff.c: output correct index lines for a split diff

233 -

234 -This is slated for maintenance series 1.6.0.X.

235 -

236 -* jc/maint-split-diff-metainfo (Tue Jan 27 01:08:02 2009 -0800) 2 commits

237 - + Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-

238 - split-diff-metainfo

239 - + diff.c: output correct index lines for a split diff

240 -

241 -Early conflict resolution branch for the above to carry it to 1.6.1.X

242 -series.

243 -

244 -* js/maint-rebase-i-submodule (Tue Jan 27 12:42:31 2009 +0100) 2 commits

245 - + Fix submodule squashing into unrelated commit

246 - + rebase -i squashes submodule changes into unrelated commit

247 -

248 -* jg/tag-contains (Mon Jan 26 09:13:25 2009 -0500) 3 commits

249 - + git-tag: Add --contains option

250 - + Make has_commit() non-static

251 - + Make opt_parse_with_commit() non-static

252 -

253 -* jc/maint-allow-uninteresting-missing (Tue Jan 27 23:19:30 2009 -0800) 1 commit

254 - + revision traversal: allow UNINTERESTING objects to be missing

255 -

256 -This is a small follow-up to the fix to send-pack in 1.6.1; meant to go in

257 -1.6.1.X maintenance series and newer.

258 -

259 -* am/maint-push-doc (Mon Jan 26 00:45:33 2009 +0100) 3 commits

260 - + Documentation: rework src/dst description in git push

261 - + Documentation: more git push examples

262 - + Documentation: simplify refspec format description

263 -

264 -* jc/maint-apply-fix (Sun Jan 25 23:41:26 2009 -0800) 1 commit

265 - + builtin-apply.c: do not set bogus mode in check_preimage() for

266 - deleted path

267 -

268 -* ks/maint-mailinfo-folded (Tue Jan 13 01:21:04 2009 +0300) 4 commits

269 - + mailinfo: tests for RFC2047 examples

270 - + mailinfo: add explicit test for mails like '<a.u.thor@example.com>

271 - (A U Thor)'

272 - + mailinfo: 'From:' header should be unfold as well

273 - + mailinfo: correctly handle multiline 'Subject:' header

274 -

275 -Graduated with a follow-up patch from the original author.

276 -

277 -* jg/mergetool (Sat Jan 24 00:12:45 2009 +0100) 1 commit

278 - + mergetool: Don't repeat merge tool candidates

279 -

280 -* jk/signal-cleanup (Thu Jan 22 01:03:28 2009 -0500) 5 commits

281 - + pager: do wait_for_pager on signal death

282 - + refactor signal handling for cleanup functions

283 - + chain kill signals for cleanup functions

284 - + diff: refactor tempfile cleanup handling

285 - + Windows: Fix signal numbers

286 -

287 -* sp/runtime-prefix (Sun Jan 18 13:00:15 2009 +0100) 7 commits

288 - + Windows: Revert to default paths and convert them by

289 - RUNTIME_PREFIX

290 - + Compute prefix at runtime if RUNTIME_PREFIX is set

291 - + Modify setup_path() to only add git_exec_path() to PATH

292 - + Add calls to git_extract_argv0_path() in programs that call

293 - git_config_*

294 - + git_extract_argv0_path(): Move check for valid argv0 from caller

295 - to callee

296 - + Refactor git_set_argv0_path() to git_extract_argv0_path()

297 - + Move computation of absolute paths from Makefile to runtime (in

298 - preparation for RUNTIME_PREFIX)

299 -

300 -There was a report that this breaks with older GNU Make.

301 -

302 -----------------------------------------------------------------

303 -[Will merge to "master" soon]

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

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

307 -

308 -This has been updated from the posted version with a correction. We

309 -should have it in 1.6.2

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

@@ -314,15 +208,54 @@ should have it in 1.6.2

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

209 + git: s/run_command/run_builtin/

210

317 -Looked good for 1.6.2.

318 -

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

323 -It is a (probably) useful new feature with a sort-of cute explanation.

324 -I am not sure if it needs further work (such as hooking it to rebase),

325 -but other than that, I think it is Ok to have in 1.6.2.

215 +----------------------------------------------------------------

216 +[Will merge to "master" soon]

217 +

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

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

220 + + utf8: add utf8_strwidth()

221 +

222 +I replaced the bottom one with a cheesy "if it does not look like

223 +utf8, give strlen back" to make the result behave sensibly for legacy

224 +encodings. It does improve "git blame git-stash.sh" output (especially

225 +if you remove .mailmap).

226 +

227 +* jk/head-symref (Thu Jan 29 03:33:02 2009 -0500) 2 commits

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

229 + + validate_headref: tighten ref-matching to just branches

230 +

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

236 + + http-push.c: get_remote_object_url() is only used under

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 +

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

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

245 + branch

246 +

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 +

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

256 + + mergetool: fix running mergetool in sub-directories

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

258 + + mergetool: respect autocrlf by using checkout-index

259

260 ----------------------------------------------------------------

261 [On Hold]

What's cooking (2009/02 #02)