8fa14eef76 · matheusbsbs/matheus-bagliano

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

1 -Subject: What's cooking in git.git (Oct 2008, #01; Mon, 06)

2 -X-master-at: 276328ffb87cefdc515bee5f09916aea6e0244ed

3 -X-next-at: 395ff9bd88b9cf14617c5e2f461878c4969726f3

1 +Subject: What's cooking in git/spearce.git (Oct 2008, #02; Sun, 12)

2 +X-master-at: 5c283eb13c94be6ca974aa722159dc9838d10d97

3 +X-next-at: 340fcf496c9eb7c8be7f14efdd282666a6b6a1f1

4

5 -What's cooking in git.git (Oct 2008, #01; Mon, 06)

5 +What's cooking in git/spearce.git (Oct 2008, #02; Sun, 12)

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

7

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

@@ -12,86 +12,86 @@ 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 -Topics aren't sorted by name; I have tried to cluster them together

16 -to tell the story of how 'next' and 'pu' have evolved this past week.

15 +gitster's back and I'm expecting he will take over from here.

16

17 ----------------------------------------------------------------

18 [New Topics]

19

21 -* sp/describe-docs (Tue Sep 30 11:55:16 2008 -0700) 1 commit

22 - . docs: Improve the description of describe --tags

20 +* dp/checkattr (Tue Oct 7 04:16:52 2008 +0400) 2 commits

21 + + check-attr: Add --stdin option

22 + + check-attr: add an internal check_attr() function

23

24 -I'm probably going to drop this topic if I can ever get around to

25 -formally writing and posting sp/describe-lwtag for review.

24 +Batch attr lookup via --stdin, for gitk and git-gui.

25

27 -* sp/describe-lwtag (Tue Sep 30 12:03:41 2008 -0700) 1 commit

28 - - [WIP] Change meaning of --tags and --all

26 +* mv/clonev (Thu Oct 9 01:40:32 2008 +0200) 1 commit

27 + + Implement git clone -v

28

30 -Modifies "git describe --tags" to allow matching against lightweight

31 -tags even when an annotated tag is found in the history. Its not

32 -in next because I haven't formally written a commit message and

33 -posted the patch for discussion on the list.

29 +Does what it says it does. This may be ready for master soon,

30 +its a pretty trivial change.

31

35 -This is a fairly significant change in behavior. Its most certainly

36 -1.6.1 material, but many argue the change is the _correct_ behavior

37 -and the current behavior in 1.6.0 is buggy.

32 +* gb/refactor-pathinfo (Fri Oct 10 20:42:26 2008 +0200) 1 commit

33 + + gitweb: refactor input parameters parse/validation

34

39 -* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits

40 - - diff: add filter for converting binary to text

41 - - diff: introduce diff.<driver>.binary

42 - - diff: unify external diff and funcname parsing code

43 - - t4012: use test_cmp instead of cmp

35 +A major cleanup on the way gitweb parses its input arguments.

36 +Future gitweb patches to add more arguments into the PATH_INFO

37 +depend upon this initial cleanup work.

38

45 -A general cleanup on how diff drivers are implemented. Its still

46 -missing documentation updates and tests but doesn't break anything

47 -current as far as I can tell. It needs more review before it can

48 -be slated for 'next'.

39 +* ml/cygwin-filemode (Sun Oct 12 14:44:46 2008 -0400) 1 commit

40 + - compat/cygwin.c - Use cygwin's stat if core.filemode == true

41

50 -* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit

51 - - Do not rename read-only files during a push

42 +I think another version may be coming to reuse the core.filemode

43 +parsing so this patch isn't in next yet.

44

53 -Supposedly fixes pack file renames on Windows, but it makes the

54 -test suite fail on Linux. I haven't debugged why yet. Its very

55 -likely we need a replacement patch before this can move forward.

45 +* sh/rebase-i-p (Wed Oct 8 01:41:57 2008 -0500) 7 commits

46 + - rebase-i-p: if todo was reordered use HEAD as the rewritten parent

47 + - rebase-i-p: do not include non-first-parent commits touching

48 + UPSTREAM

49 + - rebase-i-p: only list commits that require rewriting in todo

50 + - rebase-i-p: fix 'no squashing merges' tripping up non-merges

51 + - rebase-i-p: delay saving current-commit to REWRITTEN if squashing

52 + - rebase-i-p: use HEAD for updating the ref instead of mapping

53 + OLDHEAD

54 + - rebase-i-p: test to exclude commits from todo based on its parents

55

57 -* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit

58 - - format-patch: autonumber by default

59 -

60 -Fails the test suite; some of the test vectors need to be updated

61 -to account for the new default. Someone who cares about this

62 -change should follow through on the test suite update, or this may

63 -get dropped.

56 +Changes the `rebase -i -p` behavior to behave like git sequencer's

57 +rewrite of `rebase -i` would behave. Its parked in pu because I

58 +have not had the time to review the series in detail. First glance

59 +looked OK to me.

60

65 -* sh/maint-intrebase (Wed Oct 1 01:11:07 2008 -0500) 1 commit

66 - + Fix interactive rebase on dropped commits.

61 +* js/keephardlinks (Sat Oct 11 13:45:13 2008 +0200) 1 commit

62 + - Introduce core.keepHardLinks

63

68 -This merged to next, then was reverted out this morning, due to

69 -the introduction of the sh/maint-rebase3. Its dead and will be

70 -dropped from the next "What's cooking" release notes.

64 +The value of this change is currently in question, and the commit

65 +message doesn't justify it very well.

66

72 -* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit

73 - - rebase--interactive: fix parent rewriting for dropped commits

67 +* jn/gitweb-customlinks (Sun Oct 12 00:02:32 2008 +0200) 1 commit

68 + - gitweb: Better processing format string in custom links in navbar

69

75 -A replacement for sh/maint-intrebase. Its in pu because I have

76 -gotten 3 different versions of this patch, two of them posted a

77 -full 4 days after I merged the first version into next. I felt

78 -burned by the patch author for not keeping up with my tree, so I'm

79 -not merging the patch to next.

70 +Waiting for some sort of response from Pasky.

71

81 -At this point its going to sit in pu until Junio comes back.

82 -I think the topic needs a few more days to settle to see if the

83 -patch author is going to submit any more revisions.

72 +----------------------------------------------------------------

73 +[Graduated to "master"]

74

85 -* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit

86 - + rebase --no-verify

75 +* mw/sendemail (Sun Sep 28 07:51:21 2008 +0300) 10 commits

76 + + bash completion: Add --[no-]validate to "git send-email"

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

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

79 + + Docs: send-email: Create logical groupings for --help text

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

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

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

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

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

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

86

88 -This adds --no-verify to git rebase, to avoid the pre-rebase hook.

89 -Lacks documentation but otherwise looks sound.

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

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

89

91 -* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit

92 - + builtin-commit: use reduce_heads() only when appropriate

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

91 + + make prune report removed objects on -v

92

94 -Fixes "git merge --no-ff --no-commit".

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

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

95

96 * dp/cywginstat (Tue Sep 30 17:53:47 2008 +0400) 3 commits

97 + cygwin: Use native Win32 API for stat

@@ -106,20 +106,13 @@ to the series.

106 * js/objc-funchdr (Wed Oct 1 00:46:34 2008 +0100) 1 commit

107 + Teach git diff about Objective-C syntax

108

109 -Adds support for Objective-C function headers. I don't use

110 -Objective-C so I can't comment on how good/bad the patterns are

111 -for the language. Feedback (and improvements if necessary) from

112 -Objective-C users would be appreciated.

109 +Adds support for Objective-C function headers.

110

111 * dm/svn-branch (Sat Oct 4 19:35:17 2008 -0700) 1 commit

112 + Add git-svn branch to allow branch creation in SVN repositories

113

114 Adds "git svn branch" to build branches remotely in SVN.

115

119 -Might be ready for master, it has an ACK from Eric. Slated into next

120 -just because I wasn't sure if Junio merges such things immediately

121 -into master or lets them cook for a bit.

122 -

116 * pb/gitweb (Fri Oct 3 07:41:25 2008 -0700) 7 commits

117 + Merge branch 'pb/gitweb-tagcloud' into pb/gitweb

118 + gitweb: Support for simple project search form

@@ -129,10 +122,6 @@ into master or lets them cook for a bit.

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

123 + gitweb: Clean-up sorting of project list

124

132 -I may have been a bad interm maintainer here by shoving together

133 -two different gitweb series from Pasky. Overall the combined set

134 -looks ready to me.

135 -

125 * ph/parseopt (Thu Oct 2 14:59:20 2008 +0200) 3 commits

126 + parse-opt: migrate builtin-merge-file.

127 + parse-opt: migrate git-merge-base.

@@ -148,40 +137,77 @@ looks ready to me.

137 + xdiff-interface.c: strip newline (and cr) from line before pattern

138 matching

139

151 -* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit

152 - + rebase: Support preserving merges in non-interactive mode

140 +* jk/maint-soliconv (Fri Oct 3 02:39:36 2008 -0400) 1 commit

141 + + Makefile: do not set NEEDS_LIBICONV for Solaris 8

142 +

143 +* sg/maint-intrebase-msghook (Fri Oct 3 11:33:20 2008 +0200) 2 commits

144 + + rebase -i: remove leftover debugging

145 + + rebase -i: proper prepare-commit-msg hook argument when squashing

146 +

147 +* bc/maint-stashref (Thu Oct 2 18:52:11 2008 -0500) 1 commit

148 + + git-stash.sh: fix flawed fix of invalid ref handling (commit

149 + da65e7c1)

150

154 -These last five all look ready for master, but should cook longer

155 -than just a few days.

151 +The latter three were merged to 'maint' first.

152

153 ----------------------------------------------------------------

154 [Old New Topics]

155

160 -* mw/sendemail (Sun Sep 28 07:51:21 2008 +0300) 10 commits

161 - + bash completion: Add --[no-]validate to "git send-email"

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

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

164 - + Docs: send-email: Create logical groupings for --help text

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

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

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

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

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

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

156 +* ns/rebase-noverify (Mon Oct 6 14:14:29 2008 +0900) 1 commit

157 + + rebase --no-verify

158

172 -This series looks pretty good to me. It probably can merge to

173 -master on the next "What's cooking" cycle.

159 +This adds --no-verify to git rebase, to avoid the pre-rebase hook.

160 +Lacks documentation but otherwise looks sound.

161

175 -----------------------------------------------------------------

176 -[Dropped Topics]

162 +* mv/merge-noff (Fri Oct 3 14:04:47 2008 +0200) 1 commit

163 + + builtin-commit: use reduce_heads() only when appropriate

164 +

165 +Fixes "git merge --no-ff --no-commit".

166 +

167 +* ae/preservemerge (Mon Sep 29 22:28:57 2008 +0200) 1 commit

168 + + rebase: Support preserving merges in non-interactive mode

169 +

170 +* sh/maint-rebase3 (Sun Oct 5 23:26:52 2008 -0500) 1 commit

171 + - rebase--interactive: fix parent rewriting for dropped commits

172 +

173 +A prior version of sh/rebase-i-p. This should be dropped.

174 +

175 +* pb/rename-rowin32 (Fri Oct 3 12:20:43 2008 +0200) 1 commit

176 + - Do not rename read-only files during a push

177 +

178 +Supposedly fixes pack file renames on Windows, but it makes the

179 +test suite fail on Linux. I haven't debugged why yet. Its very

180 +likely we need a replacement patch before this can move forward.

181 +

182 +* sp/describe-lwtag (Tue Sep 30 12:03:41 2008 -0700) 1 commit

183 + - describe: Make --tags and --all match lightweight tags more often

184 +

185 +Based on feedback from the list this needs another spin. I will

186 +post a replacement patch soon.

187

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

179 - + merge: remove deprecated summary and diffstat options and config

180 - variables

188 +* gb/formatpatch-autonbr (Thu Oct 2 16:55:39 2008 -0400) 1 commit

189 + - format-patch: autonumber by default

190 +

191 +Fails the test suite; some of the test vectors need to be updated

192 +to account for the new default. Someone who cares about this

193 +change should follow through on the test suite update, or this may

194 +get dropped.

195 +

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

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

198 +

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

200 +

201 +* jk/diff-convfilter (Sun Oct 5 17:43:45 2008 -0400) 4 commits

202 + - diff: add filter for converting binary to text

203 + - diff: introduce diff.<driver>.binary

204 + - diff: unify external diff and funcname parsing code

205 + - t4012: use test_cmp instead of cmp

206

182 -This has been reverted from next and is being dropped. Its too

183 -soon to remove a feature that was just added in 1.5.6 timeframe.

184 -Perhaps in 1.7.0 this can be revisited.

207 +A general cleanup on how diff drivers are implemented. Its still

208 +missing documentation updates and tests but doesn't break anything

209 +current as far as I can tell. It needs more review before it can

210 +be slated for 'next'.

211

212 ----------------------------------------------------------------

213 [Stuck Topics]

@@ -204,12 +230,12 @@ to actively review the series. There has been some discussion on

230 list about it so its not stalled, but it needs more eyeballs.

231

232 * gb/gitweb-pathinfo (Thu Oct 2 02:10:34 2008 +0200) 6 commits

207 - - gitweb: generate parent..current URLs

208 - - gitweb: parse parent..current syntax from pathinfo

209 - - gitweb: use_pathinfo filenames start with /

210 - - gitweb: generate project/action/hash URLs

211 - - gitweb: refactor input parameters parse/validation

212 - - gitweb: parse project/action/hash_base:filename PATH_INFO

233 + . gitweb: generate parent..current URLs

234 + . gitweb: parse parent..current syntax from pathinfo

235 + . gitweb: use_pathinfo filenames start with /

236 + . gitweb: generate project/action/hash URLs

237 + . gitweb: refactor input parameters parse/validation

238 + . gitweb: parse project/action/hash_base:filename PATH_INFO

239

240 Still going through revisions on the git ML. Its great work and

241 is heading in the right direction. But the discussion and patch

@@ -243,24 +269,9 @@ don't get one during this coming week.

269 (jc: I think this is still buggy and drops the option when am stops

270 with conflicts.)

271

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

247 -yet, but Junio's comments still hold. If there's no action on

248 -these next week we may seem them drop off.

249 -

272 ----------------------------------------------------------------

273 [Will be merged to 'master/maint' soon]

274

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

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

255 -

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

257 -(jc: I rerolled this without the fake empty blob object.)

258 -

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

260 - + make prune report removed objects on -v

261 -

262 -This is a pretty trivial new feature.

263 -

275 * pb/commit-where (Fri Oct 3 22:13:49 2008 -0400) 4 commits

276 + tutorial: update output of git commit

277 + reformat informational commit message

@@ -269,22 +280,6 @@ This is a pretty trivial new feature.

280

281 I think this topic is settled for now.

282

272 -* jk/maint-soliconv (Fri Oct 3 02:39:36 2008 -0400) 1 commit

273 - + Makefile: do not set NEEDS_LIBICONV for Solaris 8

274 -

275 -* sg/maint-intrebase-msghook (Fri Oct 3 11:33:20 2008 +0200) 2 commits

276 - + rebase -i: remove leftover debugging

277 - + rebase -i: proper prepare-commit-msg hook argument when squashing

278 -

279 -* bc/maint-stashref (Thu Oct 2 18:52:11 2008 -0500) 1 commit

280 - + git-stash.sh: fix flawed fix of invalid ref handling (commit

281 - da65e7c1)

282 -

283 -The latter three are ready for 'maint'. I felt burned by a bad

284 -commit into made directly into maint earlier in the week so these

285 -wound up getting queued into 'next' first, even though they are

286 -certainly maint material.

287 -

283 ----------------------------------------------------------------

284 [Actively Cooking]

285

@@ -298,16 +293,7 @@ certainly maint material.

293 a good starting point, possibly others to add other recommended

294 flows later.)

295

301 -I haven't looked at this series yet. Based on Junio's remarks above

302 -I'm looking for more input on this series before it goes anywhere.

303 -

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

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

306 -

307 -I need to look at this in more detail. I suspect we can merge

308 -this to master soon, but its been kicking around since Aug 16th.

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

310 -has no notes on this branch and why it hasn't merged yet.

296 +An update came in recently, but I haven't applied it.

297

298 ----------------------------------------------------------------

299 [On Hold]

@@ -320,13 +306,13 @@ has no notes on this branch and why it hasn't merged yet.

306 so great.)

307

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

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

324 - - git-am: clean-up Signed-off-by: lines

325 - - stripspace: add --log-clean option to clean up signed-off-by:

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

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

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

312 lines

327 - - stripspace: use parse_options()

328 - - Add "git am -s" test

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

313 + . stripspace: use parse_options()

314 + . Add "git am -s" test

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

316

317 (jc: The one at second from the tip needs reworking.)

318

@@ -342,11 +328,6 @@ this topic and resolve the deadlock before it can continue.

328 format

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

330

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

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

347 -

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

349 -

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

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

333 asked for

What's cooking (2008/10 #02)