08ad642484 · matheusbsbs/matheus-bagliano

@@ -1,8 +1,8 @@

1 -Subject: What's cooking in git.git (Sep 2008, #04; Mon, 22)

2 -X-master-at: c76dc9592d1c770212d50ee7a7028a74f472f23b

3 -X-next-at: 7f0eb98a28d41e28f6a7b72e118d72de01bab1a7

1 +Subject: What's cooking in git.git (Sep 2008, #05; Mon, 29)

2 +X-master-at: 9800c0df412869c7949935b61581b9361fc49bd1

3 +X-next-at: 37dbc802cfed9d39ff15dfd333bdd2e74ca9f458

4

5 -What's cooking in git.git (Sep 2008, #04; Mon, 22)

5 +What's cooking in git.git (Sep 2008, #05; Mon, 29)

6 --------------------------------------------------

7

8 Here are the topics that have been cooking. Commits prefixed

@@ -12,57 +12,59 @@ in 'next'.

12 The topics list the commits in reverse chronological order. The topics

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

14

15 -I'll be on vacation til Oct 08; proposal/review/discussion/improvement

16 -cycle based on e-mails and the distributed nature of git mean that it

17 -shouldn't keep the participants from further improving the system. I've

18 -asked Shawn to look after in-flight patches during the time, so hopefully

19 -when I come back I'll see a much better git ;-).

15 +If I have dropped anything recently its not because I don't want

16 +to apply it, it just slipped through the cracks. Please feel free

17 +to give me a gentle prod (and a patch resend or a pointer to the

18 +series on gmane). Thanks.

19

20 ----------------------------------------------------------------

21 [New Topics]

22

24 -* nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits

25 - - grep: skip files that have not been checked out

26 - - checkout_entry(): CE_NO_CHECKOUT on checked out entries.

27 - - Prevent diff machinery from examining worktree outside narrow

28 - checkout

29 - - Add tests for updating no-checkout entries in index

30 - - ls-files: add --narrow-checkout option to "will checkout" entries

31 - - update-index: add --checkout/--no-checkout to update

32 - CE_NO_CHECKOUT bit

33 - - update-index: refactor mark_valid() in preparation for new options

34 - - Introduce CE_NO_CHECKOUT bit

35 - - Extend index to save more flags

23 +* gb/gitweb-pathinfo (Mon Sep 29 17:26:57 2008 +0200) 4 commits

24 + - gitweb: generate parent..current URLs

25 + - gitweb: parse parent..current syntax from pathinfo

26 + - gitweb: generate project/action/hash URLs

27 + - gitweb: parse project/action/hash_base:filename PATH_INFO

28

37 -This is an early half of the earlier series (I haven't had chance to look

38 -at the updated series yet), and should be replaced with the updated one

39 -posted recently.

29 +This series just came in today. I haven't had a chance to look at

30 +it beyond stashing in `pu`.

31

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

42 -[Stalled -- Needs Action to Proceed (or to be dropped)]

32 +* mw/sendemail (Mon Sep 29 12:41:06 2008 -0500) 8 commits

33 + - send-email: signedoffcc -> signedoffbycc, but handle both

34 + - Docs: send-email: Create logical groupings for man text

35 + - Docs: send-email: Remove unnecessary config variable description

36 + - Docs: send-email: --chain_reply_to -> --[no-]chain-reply-to

37 + - send-email: change --no-validate to boolean --[no-]validate

38 + - Docs: send-email: Man page option ordering

39 + - Docs: send-email usage text much sexier

40 + - Docs: send-email's usage text and man page mention same options

41

44 -* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit

45 - - t7400: Add short "git submodule add" testsuite

42 +This series has already gone through 3 iterations before I could

43 +start to carry it in-tree. I haven't had a chance to read it yet

44 +myself, so its sitting around in `pu` for futher review.

45

47 -Waiting for a reroll.

46 +* pb/gitweb (Thu Sep 25 18:48:48 2008 +0200) 2 commits

47 + - gitweb: Sort the list of forks on the summary page by age

48 + - gitweb: Clean-up sorting of project list

49

49 -* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits

50 - - Use xdiff caching to improve git blame performance

51 - - Allow xdiff machinery to cache hash results for a file

52 - - Always initialize xpparam_t to 0

53 - - Bypass textual patch generation and parsing in git blame

54 - - Allow alternate "low-level" emit function from xdl_diff

50 +I forgot to look at this series today. I meant to review and try

51 +to merge it to `next` before publishing. Will do that tomorrow.

52

56 -Réne had good comments on how the callback should be structured.

53 +* ae/preservemerge (Tue Sep 23 22:58:20 2008 +0200) 3 commits

54 + - git pull: Support --preserve-merges as a flag to rebase

55 + - git rebase: Support non-interactive merge-preserving rebase

56 + - Prepare for non-interactive merge-preserving rebase

57

58 -* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit

59 - - git-am: Pass the --directory option through to git-apply

58 +Andreas says there's some issues in here. I'm waiting for a respin

59 +on the series before I look at it futher.

60 +

61 +* mg/verboseprune (Mon Sep 29 18:49:52 2008 +0200) 1 commit

62 + - make prune report removed objects on -v

63

61 -I think this is still buggy and drops the option when am stops with

62 -conflicts.

64 +Just came in today. Looks sane. I'll drop it onto `next` tomorrow.

65

66 ----------------------------------------------------------------

65 -[Will be merged to 'master/maint' soon]

67 +[Graduated to "master"]

68

69 * mv/merge-recursive (Sat Sep 6 18:29:49 2008 +0200) 11 commits

70 + builtin-merge: release the lockfile in try_merge_strategy()

@@ -167,8 +169,6 @@ conflicts.

169

170 (Tip at 4d6e4c4)

171

170 -I think the above are all ready for 'master'.

171 -

172 * mg/maint-remote-fix (Mon Sep 22 10:57:51 2008 +0200) 1 commit

173 + make "git remote" report multiple URLs

174

@@ -186,7 +186,70 @@ I think the above are all ready for 'master'.

186

187 (Tip at 96d1a8e)

188

189 -The above two are ready for 'maint'.

189 +----------------------------------------------------------------

190 +[Old New Topics]

191 +

192 +* nd/narrow (Sun Sep 14 20:07:59 2008 +0700) 9 commits

193 + - grep: skip files that have not been checked out

194 + - checkout_entry(): CE_NO_CHECKOUT on checked out entries.

195 + - Prevent diff machinery from examining worktree outside narrow

196 + checkout

197 + - Add tests for updating no-checkout entries in index

198 + - ls-files: add --narrow-checkout option to "will checkout" entries

199 + - update-index: add --checkout/--no-checkout to update

200 + CE_NO_CHECKOUT bit

201 + - update-index: refactor mark_valid() in preparation for new options

202 + - Introduce CE_NO_CHECKOUT bit

203 + - Extend index to save more flags

204 +

205 +[jc: This is an early half of the earlier series (I haven't had

206 + chance to look at the updated series yet), and should be replaced

207 + with the updated one posted recently.]

208 +

209 +I haven't touched this branch since I inherited it from Junio.

210 +I'd appreciate a resend or a pointer to the updated series so I

211 +can at least replace it.

212 +

213 +----------------------------------------------------------------

214 +[Stalled -- Needs Action to Proceed (or to be dropped)]

215 +

216 +* pb/submodule (Fri Sep 12 23:09:19 2008 +0200) 1 commit

217 + - t7400: Add short "git submodule add" testsuite

218 +

219 +[jc: Waiting for a reroll.]

220 +

221 +* bd/blame (Thu Aug 21 18:22:01 2008 -0500) 5 commits

222 + - Use xdiff caching to improve git blame performance

223 + - Allow xdiff machinery to cache hash results for a file

224 + - Always initialize xpparam_t to 0

225 + - Bypass textual patch generation and parsing in git blame

226 + - Allow alternate "low-level" emit function from xdl_diff

227 +

228 +[jc: Réne had good comments on how the callback should be

229 + structured.]

230 +

231 +* kb/am-directory (Fri Aug 29 15:27:50 2008 -0700) 1 commit

232 + - git-am: Pass the --directory option through to git-apply

233 +

234 +[jc: I think this is still buggy and drops the option when am stops

235 + with conflicts.]

236 +

237 +All three of these are stalled. I'm not going to drop them just

238 +yet, but Junio's comments still hold. If there's no action on

239 +these next week we may seem them drop off.

240 +

241 +----------------------------------------------------------------

242 +[Will be merged to 'master/maint' soon]

243 +

244 +* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit

245 + + git-add --intent-to-add (-N)

246 +

247 +Teaches "git add" to record only the intent to add a path later.

248 +[jc: I rerolled this without the fake empty blob object.]

249 +

250 +I'm inclined to merge this next week.

251 +

252 +(Tip at 3942581)

253

254 ----------------------------------------------------------------

255 [Actively Cooking]

@@ -195,36 +258,41 @@ The above two are ready for 'maint'.

258 + Documentation: Refer to git-rebase(1) to warn against rewriting

259 + Documentation: new upstream rebase recovery section in git-rebase

260

198 -My impression from the last round of discusson on the third patch in this

199 -series (not queued here) was that as long as we do not present it as "One

200 -True Workflow", the description was a good starting point, possibly others

201 -to add other recommended flows later.

261 +[jc: My impression from the last round of discusson on the third

262 + patch in this series (not queued here) was that as long as we

263 + do not present it as "One True Workflow", the description was

264 + a good starting point, possibly others to add other recommended

265 + flows later.]

266 +

267 +I haven't looked at this series yet. Based on Junios remarks above

268 +I'm looking for more input on this series before it goes anywhere.

269

270 * pb/commit-where (Mon Sep 8 01:05:41 2008 +0200) 1 commit

271 + builtin-commit.c: show on which branch a commit was added

272

206 -Tentatively kicked back to "still cooking" status after Jeff voiced his

207 -annoyance. I personally do not like making this multi-line as Jeff

208 -suggested as an alternative (the message already is too verbose to my

209 -taste).

273 +[jc: Tentatively kicked back to "still cooking" status after

274 + Jeff voiced his annoyance. I personally do not like making this

275 + multi-line as Jeff suggested as an alternative (the message already

276 + is too verbose to my taste).]

277 +

278 +Agree with Junio. Hence its still here.

279

280 * lt/time-reject-fractional-seconds (Sat Aug 16 21:25:40 2008 -0700) 1 commit

281 + date/time: do not get confused by fractional seconds

282

214 -* jc/add-ita (Thu Aug 21 01:44:53 2008 -0700) 1 commit

215 - + git-add --intent-to-add (-N)

283 +I need to look at this in more detail. I suspect we can merge

284 +this to master soon, but its been kicking around since Aug 16th.

285 +I need to look at it to see if there's any obvious reason why Junio

286 +has no notes on this branch and why it hasn't merged yet.

287

217 -Teaches "git add" to record only the intent to add a path later.

218 -I rerolled this without the fake empty blob object.

288 +----------------------------------------------------------------

289 +[On Hold]

290

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

292 - revision --simplify-merges: incremental simplification

293 - revision --simplify-merges: prepare for incremental simplification

294

224 -I started making this incremental but the progress is not so great.

225 -

226 -----------------------------------------------------------------

227 -[On Hold]

295 +[jc: I started making this incremental but the progress is not so great.]

296

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

298 - git-am --forge: add Signed-off-by: line for the author

@@ -235,32 +303,39 @@ I started making this incremental but the progress is not so great.

303 - Add "git am -s" test

304 - git-am: refactor code to add signed-off-by line for the committer

305

238 -The one at second from the tip needs reworking.

306 +[jc: The one at second from the tip needs reworking.]

307

308 * jc/send-pack-tell-me-more (Thu Mar 20 00:44:11 2008 -0700) 1 commit

309 - "git push": tellme-more protocol extension

310

311 * jc/merge-whitespace (Sun Feb 24 23:29:36 2008 -0800) 1 commit

244 - - WIP: start teaching the --whitespace=fix to merge machinery

312 + . WIP: start teaching the --whitespace=fix to merge machinery

313 +

314 +This has a merge conflict with `next` and isn't even in pu right now.

315

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

317 - blame: show "previous" information in --porcelain/--incremental

318 format

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

320

321 +I should look at this in more detail. We may be able to merge it

322 +to next soon-ish.

323 +

324 * sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 1 commit

325 + merge: remove deprecated summary and diffstat options and config

326 variables

327

255 -This was previously in "will be in master soon" category, but it turns out

256 -that the synonyms to the ones this one deletes are fairly new invention

257 -that happend in 1.5.6 timeframe, and we cannot do this just yet. Perhaps

258 -in 1.7.0, but with the loud whining about moving git-foo out of $PATH we

259 -have been hearing, it might not be a bad idea to drop this.

328 +[jc: This was previously in "will be in master soon" category,

329 + but it turns out that the synonyms to the ones this one deletes

330 + are fairly new invention that happend in 1.5.6 timeframe, and

331 + we cannot do this just yet. Perhaps in 1.7.0, but with the loud

332 + whining about moving git-foo out of $PATH we have been hearing,

333 + it might not be a bad idea to drop this.]

334

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

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

337 asked for

338

265 -This would be the right thing to do for command line use, but gitk will be

266 -hit due to tcl/tk's limitation, so I am holding this back for now.

339 +[jc: This would be the right thing to do for command line use,

340 + but gitk will be hit due to tcl/tk's limitation, so I am holding

341 + this back for now.]

What's cooking (2008/09 #05)