df97f4ef26 · matheusbsbs/matheus-bagliano

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

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

2 -X-master-at: 5c283eb13c94be6ca974aa722159dc9838d10d97

3 -X-next-at: 340fcf496c9eb7c8be7f14efdd282666a6b6a1f1

1 +Subject: What's cooking in git.git (Oct 2008, #03; Tue, 14)

2 +X-master-at: 67faaaba8338cf59c212ce5239eeb223a77acdf0

3 +X-next-at: f1ba443bf7f7fae740f81058fca0bcff3613d999

4

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

5 +What's cooking in git.git (Oct 2008, #03; Tue, 14)

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

7

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

@@ -12,152 +12,89 @@ 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 -gitster's back and I'm expecting he will take over from here.

15 +This round I haven't added anything new yet. Just getting my development

16 +repository back into shape and in sync with what I received from Shawn.

17

18 ----------------------------------------------------------------

19 [New Topics]

20

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 -Batch attr lookup via --stdin, for gitk and git-gui.

25 -

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

27 - + Implement git clone -v

28 -

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

30 -its a pretty trivial change.

31 -

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

33 - + gitweb: refactor input parameters parse/validation

34 -

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 -

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 -

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

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

21 +* js/maint-fetch-update-head (Mon Oct 13 11:36:52 2008 +0200) 1 commit

22 + - Fix fetch/pull when run without --update-head-ok

23

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 -

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 -

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

62 - - Introduce core.keepHardLinks

63 -

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

65 -message doesn't justify it very well.

66 -

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 -

70 -Waiting for some sort of response from Pasky.

24 +This looked sane to me.

25

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

73 -[Graduated to "master"]

74 -

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 -

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

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

89 -

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

91 - + make prune report removed objects on -v

92 -

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

98 - + mingw: move common functionality to win32.h

99 - + add have_git_dir() function

27 +[Stuck Topics]

28

101 -Performance improvement for Cygwin, bypassing the Cygwin stat

102 -function and using one more like MinGW uses. Probably ready for

103 -master on the next round. Several Cygwin users have given praise

104 -to the series.

29 +* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits

30 + - grep: skip files outside sparse checkout area

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

32 + - Prevent diff machinery from examining worktree outside sparse

33 + checkout

34 + - ls-files: Add tests for --sparse and friends

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

36 + CE_NO_CHECKOUT bit

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

38 + - ls-files: add options to support sparse checkout

39 + - Introduce CE_NO_CHECKOUT bit

40 + - Extend index to save more flags

41

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

107 - + Teach git diff about Objective-C syntax

42 +Recently updated with a repost. Shawn says he's been too swamped at

43 +day-job to actively review the series. There has been some discussion on

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

45

109 -Adds support for Objective-C function headers.

46 +----------------------------------------------------------------

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

48

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

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

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

51

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

52 +Still waiting for a reroll. Should be dropped next week if we don't

53 +get one during this coming week.

54

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

119 - + gitweb: Make the by_tag filter delve in forks as well

120 - + gitweb: Support for tag clouds

121 - + gitweb: Add support for extending the action bar with custom links

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

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

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

56 + - Use xdiff caching to improve git blame performance

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

58 + - Always initialize xpparam_t to 0

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

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

61

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.

128 - + parse-opt: migrate fmt-merge-msg.

62 +Réne had good comments on how the callback should be structured.

63

130 -* rz/grepz (Wed Oct 1 18:11:15 2008 +0200) 1 commit

131 - + git grep: Add "-z/--null" option as in GNU's grep.

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

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

66

133 -* mv/merge-refresh (Fri Oct 3 15:02:31 2008 +0200) 1 commit

134 - + builtin-merge: refresh the index before calling a strategy

67 +I think this is still buggy and drops the option when am stops with

68 +conflicts.

69

136 -* bc/xdiffnl (Wed Oct 1 14:28:26 2008 -0500) 1 commit

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

138 - matching

70 +----------------------------------------------------------------

71 +[Will be merged to 'master' soon]

72

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

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

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

74 + + tutorial: update output of git commit

75 + + reformat informational commit message

76 + + git commit: Reformat output somewhat

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

78

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

79 +Shawn thinks this topic is settled for now, and I see that the new output

80 +format does not bother me very much, so please expect this to be merged

81 +soon.

82

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)

83 +----------------------------------------------------------------

84 +[Actively Cooking]

85

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

86 +* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits

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

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

89

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

154 -[Old New Topics]

90 +Shawn says that an update came in recently, but they are not here yet.

91 +I'd need to dig it up, but I haven't had time.

92

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

94 + rebase --no-verify

95

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

160 -Lacks documentation but otherwise looks sound.

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

97 +documentation but otherwise looks sound.

98

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

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

@@ -167,37 +104,45 @@ Fixes "git merge --no-ff --no-commit".

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

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

106

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

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

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

110 + UPSTREAM

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

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

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

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

115 + OLDHEAD

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

117 +

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

119 +rewrite of `rebase -i` would behave.

120 +

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

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

122 + . rebase--interactive: fix parent rewriting for dropped commits

123

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

124 +Tentatively dropped from everwhere, waiting for a reroll together with

125 +sh/rebase-i-p.

126

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

127 +* pb/rename-rowin32 (Sun Oct 12 21:01:23 2008 -0700) 2 commits

128 + - (squash): index-pack: do not unconditionally make packfile read-

129 + only

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

131

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.

132 +Supposedly fixes pack file renames on Windows. The (squash) patch is my

133 +attempt to fix its breakage.

134

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

135 +* sp/describe-lwtag (Mon Oct 13 07:39:46 2008 -0700) 1 commit

136 - describe: Make --tags and --all match lightweight tags more often

137

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

186 -post a replacement patch soon.

138 +When the user gives --tags, the request is asking to treat lightweight and

139 +annotated tags at equal weight, and if lightweight ones are closer, they

140 +should be used.

141

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

142 +* gb/formatpatch-autonbr (Sun Oct 12 22:18:02 2008 -0700) 2 commits

143 + - (squash) adjust test vector for new behaviour of format-patch

144 - format-patch: autonumber by default

145

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 -

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

147 - diff: add filter for converting binary to text

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

@@ -209,91 +154,34 @@ missing documentation updates and tests but doesn't break anything

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

155 be slated for 'next'.

156

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

213 -[Stuck Topics]

214 -

215 -* nd/narrow (Wed Oct 1 11:04:09 2008 +0700) 9 commits

216 - - grep: skip files outside sparse checkout area

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

218 - - Prevent diff machinery from examining worktree outside sparse

219 - checkout

220 - - ls-files: Add tests for --sparse and friends

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

222 - CE_NO_CHECKOUT bit

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

224 - - ls-files: add options to support sparse checkout

225 - - Introduce CE_NO_CHECKOUT bit

226 - - Extend index to save more flags

227 -

228 -Recently updated with a repost. I've been too swamped at day-job

229 -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

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

242 -generation rate is too high to merge the topic into next just yet.

243 -

244 -So its waiting for a re-roll of the series once discussion settles

245 -down and there is a final patch series available.

246 -

247 -----------------------------------------------------------------

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

249 -

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

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

252 -

253 -Still waiting for a reroll. Should be dropped next week if we

254 -don't get one during this coming week.

255 -

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

257 - - Use xdiff caching to improve git blame performance

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

259 - - Always initialize xpparam_t to 0

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

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

262 -

263 -(jc: Réne had good comments on how the callback should be

264 - structured.)

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

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

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

160

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

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

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

162

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

270 - with conflicts.)

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

164 + + Implement git clone -v

165

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

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

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

167 +its a pretty trivial change.

168

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

278 - + git commit: Reformat output somewhat

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

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

170 + + gitweb: refactor input parameters parse/validation

171

281 -I think this topic is settled for now.

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

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

174 +depend upon this initial cleanup work.

175

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

284 -[Actively Cooking]

176 +* ml/cygwin-filemode (Mon Oct 13 00:33:31 2008 -0400) 1 commit

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

178

286 -* tr/workflow-doc (Sat Sep 13 18:11:01 2008 +0200) 2 commits

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

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

179 +Is ready for 'next'.

180

290 -(jc: My impression from the last round of discusson on the third

291 - patch in this series (not queued here) was that as long as we

292 - do not present it as "One True Workflow", the description was

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

294 - flows later.)

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

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

183

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

184 +Waiting for some sort of response from Pasky.

185

186 ----------------------------------------------------------------

187 [On Hold]

@@ -302,8 +190,8 @@ An update came in recently, but I haven't applied it.

190 - revision --simplify-merges: incremental simplification

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

192

305 -(jc: I started making this incremental but the progress is not

306 - so great.)

193 +I started making this incremental but the progress is not

194 +so great.

195

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

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

@@ -314,14 +202,12 @@ An update came in recently, but I haven't applied it.

202 . Add "git am -s" test

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

204

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

318 -

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

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

207

322 -This is a great idea, but IIRC its implementation has a deadlock

323 -during communication between the peers. Someone needs to pick up

324 -this topic and resolve the deadlock before it can continue.

208 +This seems to have a deadlock during communication between the peers.

209 +Someone needs to pick up this topic and resolve the deadlock before it can

210 +continue.

211

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

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

@@ -332,6 +218,6 @@ this topic and resolve the deadlock before it can continue.

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

219 asked for

220

335 -(jc: This would be the right thing to do for command line use,

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

337 - this back for now.)

221 +This would be the right thing to do for command line use,

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

223 +this back for now.

What's cooking (2008/10 #03)