05401812f0 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Dec 2008, #04; Mon, 29)

3 -X-master-at: c32f76f4d220e5d4d6a599d7a12a50b1e3ceceaf

4 -X-next-at: 6f67462436796045e0656107418221a6696bd5f2

2 +Subject: What's cooking in git.git (Jan 2009, #01; Mon, 05)

3 +X-master-at: e9b852310ebc271bdd71bb3b980e77325ad7f75f

4 +X-next-at: 866a4abd3e8fee98a6d3bc74510db28c4bca0c48

5

6 -What's cooking in git.git (Dec 2008, #04; Mon, 29)

6 +What's cooking in git.git (Jan 2009, #01; Mon, 05)

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

8

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

@@ -14,33 +14,73 @@ but I am still 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 +Sorry to have been lagging a bit. There are a few patches I am interested

18 +in but haven't studied yet nor mentioned here. I've been swamped outside

19 +git lately for the past few days, but hopefully I can get to them shortly.

20 +

21 ----------------------------------------------------------------

22 [New Topics]

23

20 -* nd/grep-assume-unchanged (Sat Dec 27 15:21:03 2008 +0700) 2 commits

21 - - grep: grep cache entries if they are "assume unchanged"

22 - - grep: support --no-ext-grep to test builtin grep

24 +* js/bundle-tags (Fri Jan 2 19:08:46 2009 +0100) 1 commit

25 + + bundle: allow rev-list options to exclude annotated tags

26

24 -* rs/diff-ihc (Sun Dec 28 19:45:32 2008 +0100) 1 commit

25 - + diff: add option to show context between close hunks

27 +* js/add-not-submodule (Fri Jan 2 19:08:40 2009 +0100) 1 commit

28 + + git add: do not add files from a submodule

29

27 -* as/maint-shortlog-cleanup (Wed Dec 24 17:34:44 2008 +0100) 2 commits

28 - - builtin-shortlog.c: do not unnecessarily strdup before insertion

29 - in list

30 - - builtin-shortlog.c: use string_list_append() instead of

31 - duplicating its code

30 +* pb/maint-git-pm-false-dir (Mon Dec 29 01:25:00 2008 +0100) 1 commit

31 + + Git.pm: correctly handle directory name that evaluates to "false"

32

33 -* js/maint-merge-recursive-r-d-conflict (Mon Dec 22 23:10:20 2008 +0100) 1 commit

34 - + merge-recursive: mark rename/delete conflict as unmerged

33 +* pj/maint-ldflags (Sun Jan 4 21:27:41 2009 -0500) 1 commit

34 + + configure clobbers LDFLAGS

35

36 -* kk/maint-http-push (Tue Dec 23 11:31:15 2008 +0300) 1 commit

37 - + http-push: support full URI in handle_remote_ls_ctx()

36 +* fe/cvsserver (Fri Jan 2 16:40:14 2009 +0100) 2 commits

37 + + cvsserver: change generation of CVS author names

38 + + cvsserver: add option to configure commit message

39

39 -* jc/maint-ls-tree (Thu Dec 25 16:54:23 2008 -0800) 1 commit

40 - + ls-tree: add --full-tree option

40 +* js/maint-bisect-gitk (Fri Jan 2 19:08:00 2009 +0100) 1 commit

41 + + bisect view: call gitk if Cygwin's SESSIONNAME variable is set

42

42 -* mh/maint-sendmail-cc-doc (Mon Dec 29 00:37:25 2008 +0100) 1 commit

43 - + doc/git-send-email: mention sendemail.cc config variable

43 +* np/no-loosen-prune-expire-now (Tue Dec 30 14:45:11 2008 -0500) 1 commit

44 + + objects to be pruned immediately don't have to be loosened

45 +

46 +* cb/maint-unpack-trees-absense (Thu Jan 1 21:54:33 2009 +0100) 3 commits

47 + + unpack-trees: remove redundant path search in verify_absent

48 + + unpack-trees: fix path search bug in verify_absent

49 + + unpack-trees: handle failure in verify_absent

50 +

51 +* mc/cd-p-pwd (Tue Dec 30 07:10:24 2008 -0800) 1 commit

52 + + git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on

53 + OS X

54 +

55 +All of the above are good fixes and clean-ups; will be fast-tracked to

56 +'master' and maintenance branches as appropriate.

57 +

58 +* mv/apply-parse-opt (Sun Dec 28 00:03:57 2008 +0100) 1 commit

59 + + parse-opt: migrate builtin-apply.

60 +

61 +* mh/cherry-default (Thu Jan 1 22:56:29 2009 +0100) 2 commits

62 + + Documentation: clarify which parameters are optional to git-cherry

63 + + git-cherry: make <upstream> parameter optional

64 +

65 +* rs/maint-shortlog-foldline (Mon Dec 29 23:15:50 2008 +0100) 1 commit

66 + - [Need tidying up the log] pretty: support multiline subjects with

67 + format:

68 +

69 +* tr/rebase-root (Fri Jan 2 23:28:29 2009 +0100) 4 commits

70 + - rebase: update documentation for --root

71 + - rebase -i: learn to rebase root commit

72 + - rebase: learn to rebase root commit

73 + - rebase -i: execute hook only after argument checking

74 +

75 +I should be able to find time to read this over again and merge to

76 +'next' sometime this week.

77 +

78 +* as/autocorrect-alias (Sun Jan 4 18:16:01 2009 +0100) 1 commit

79 + + git.c: make autocorrected aliases work

80 +

81 +* as/commit-signoff (Mon Dec 29 12:16:45 2008 +0100) 1 commit

82 + - [WIP] Add a commit.signoff configuration option to always use --

83 + signoff in commit

84

85 ----------------------------------------------------------------

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

@@ -50,9 +90,7 @@ meant to be merged to the maintenance series have "maint-" in their names.

90 . Add / command in add --patch

91 . git-add -i/-p: Change prompt separater from slash to comma

92

53 -I am still holding onto this earlier topic to add '/' subcommand to allow

54 -finding a hunk with given text, but I'd rather not merge/rebase it on top

55 -of wp/add-p-goto series myself. Waiting for a reroll.

93 +Will discard and wait for a resubmit.

94

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

96 . git-am: Pass the --directory option through to git-apply

@@ -67,7 +105,9 @@ it is up to intrested volunteers to carry it forward.

105

106 This automatically enables threaded delta search code when autoconf

107 detects pthreads are usable. I haven't heard neither positive nor

70 -negative comments from minority platforms that might be harmed.

108 +negative comments from minority platforms that might be harmed, but

109 +this feels like the right thing to do, so perhaps the best course of

110 +action is to merge this down to 'master' and see if anybody screams.

111

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

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

@@ -83,18 +123,17 @@ need to be resurrected before this can move forward.

123 ----------------------------------------------------------------

124 [Actively cooking]

125

86 -* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit

87 - - gitweb: unify boolean feature subroutines

126 +* nd/grep-assume-unchanged (Sat Dec 27 15:21:03 2008 +0700) 2 commits

127 + + grep: grep cache entries if they are "assume unchanged"

128 + + grep: support --no-ext-grep to test builtin grep

129

89 -* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits

90 - + Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-

91 - recursive-fix

92 - + merge-recursive: do not clobber untracked working tree garbage

93 - + modify/delete conflict resolution overwrites untracked file

130 +* as/maint-shortlog-cleanup (Tue Dec 30 22:01:44 2008 +0100) 1 commit

131 + + builtin-shortlog.c: use string_list_append(), and don't strdup

132 + unnecessarily

133

95 -* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits

96 - + merge-recursive: do not clobber untracked working tree garbage

97 - + modify/delete conflict resolution overwrites untracked file

134 +* jc/maint-ls-tree (Wed Dec 31 19:00:50 2008 +0900) 2 commits

135 + + Document git-ls-tree --full-tree

136 + + ls-tree: add --full-tree option

137

138 * js/notes (Sat Dec 20 13:06:03 2008 +0100) 4 commits

139 - Add an expensive test for git-notes

@@ -102,23 +141,6 @@ need to be resurrected before this can move forward.

141 - Add a script to edit/inspect notes

142 - Introduce commit notes

143

105 -* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits

106 - + Add 'g' command to go to a hunk

107 - + Add subroutine to display one-line summary of hunks

108 -

109 -* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits

110 - - gitweb: cache $parent_commit info in git_blame()

111 - - gitweb: A bit of code cleanup in git_blame()

112 - - gitweb: Move 'lineno' id from link to row element in git_blame

113 -

114 -Jakub seemed to feel they are not yet ready.

115 -

116 -* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit

117 - + Add support for a pdf version of the user manual

118 -

119 -I do not have a new enough combination of dblatex and asciidoc myself but

120 -this may help interested people.

121 -

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

145 - gitweb: Optional grouping of projects by category

146 - gitweb: Split git_project_list_body in two functions

@@ -133,33 +155,51 @@ this may help interested people.

155 ----------------------------------------------------------------

156 [Graduated to "master"]

157

136 -* js/rebase-i-p (Mon Dec 15 11:05:31 2008 +0100) 2 commits

137 - + rebase -i -p: Fix --continue after a merge could not be redone

138 - + Show a failure of rebase -p if the merge had a conflict

139 -

140 -* np/auto-thread (Mon Dec 15 20:44:30 2008 +0100) 3 commits

141 - + Force t5302 to use a single thread

142 - + pack-objects: don't use too many threads with few objects

143 - + autodetect number of CPUs by default when using threads

144 -

145 -* lt/reset-merge (Wed Dec 3 18:00:12 2008 -0800) 2 commits

146 - + Document "git-reset --merge"

147 - + Add 'merge' mode to 'git reset'

148 -

149 -----------------------------------------------------------------

150 -[Will merge to "master" soon]

151 -

158 * cb/mergetool (Fri Dec 12 21:48:41 2008 +0000) 4 commits

159 + mergetool: Don't keep temporary merge files unless told to

160 + mergetool: Add prompt to continue after failing to merge a file

161 + Add -y/--no-prompt option to mergetool

162 + Fix some tab/space inconsistencies in git-mergetool.sh

163

158 -I have been waiting for comments from the original author and other

159 -interested parties, but haven't heard anything yet. This tool is on the

160 -fringe from my point of view anyway, so I'll push them out to 'master'

161 -soon. If there is a breakage that annoys real people, we will hear from

162 -them, and we can take it from there.

164 +----------------------------------------------------------------

165 +[Will merge to "master" soon]

166 +

167 +* mh/maint-sendmail-cc-doc (Mon Dec 29 00:37:25 2008 +0100) 1 commit

168 + + doc/git-send-email: mention sendemail.cc config variable

169 +

170 +* rs/diff-ihc (Sun Dec 28 19:45:32 2008 +0100) 1 commit

171 + + diff: add option to show context between close hunks

172 +

173 +* js/maint-merge-recursive-r-d-conflict (Mon Dec 22 23:10:20 2008 +0100) 1 commit

174 + + merge-recursive: mark rename/delete conflict as unmerged

175 +

176 +* mk/gitweb-feature (Mon Dec 15 22:16:19 2008 -0800) 1 commit

177 + + gitweb: unify boolean feature subroutines

178 +

179 +* cb/merge-recursive-fix (Mon Dec 15 02:41:24 2008 -0800) 3 commits

180 + + Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-

181 + recursive-fix

182 + + merge-recursive: do not clobber untracked working tree garbage

183 + + modify/delete conflict resolution overwrites untracked file

184 +

185 +* cb/maint-merge-recursive-fix (Sun Dec 14 19:40:09 2008 -0800) 2 commits

186 + + merge-recursive: do not clobber untracked working tree garbage

187 + + modify/delete conflict resolution overwrites untracked file

188 +

189 +* wp/add-p-goto (Thu Dec 4 10:22:40 2008 +0000) 2 commits

190 + + Add 'g' command to go to a hunk

191 + + Add subroutine to display one-line summary of hunks

192 +

193 +* jn/gitweb-blame (Thu Dec 11 01:33:29 2008 +0100) 3 commits

194 + + gitweb: cache $parent_commit info in git_blame()

195 + + gitweb: A bit of code cleanup in git_blame()

196 + + gitweb: Move 'lineno' id from link to row element in git_blame

197 +

198 +* mv/um-pdf (Wed Dec 10 23:44:50 2008 +0100) 1 commit

199 + + Add support for a pdf version of the user manual

200 +

201 +* kk/maint-http-push (Tue Dec 23 11:31:15 2008 +0300) 1 commit

202 + + http-push: support full URI in handle_remote_ls_ctx()

203

204 ----------------------------------------------------------------

205 [On Hold]

@@ -185,8 +225,8 @@ them, and we can take it from there.

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

226 - Introduce CE_NO_CHECKOUT bit

227

188 -Kicked out of 'next' by popular demand (see recent discussion on the

189 -interaction between the checkout area and commands such as "grep").

228 +Will drop shortly, but there may be some other fixes to CE_VALID, like

229 +nd/grep-assume-unchanged topic above, that we may want to resurrect.

230

231 * jc/clone-symref-2 (Sat Nov 29 23:38:21 2008 -0800) 7 commits

232 - clone: test the new HEAD detection logic

@@ -199,7 +239,8 @@ interaction between the checkout area and commands such as "grep").

239 - get_remote_heads(): refactor code to read "server capabilities"

240

241 An attempt to extend the fetch protocol to make the logic to detect where

202 -HEAD on the origin site points to more robust.

242 +HEAD on the origin site points to more robust. Will drop shortly as the

243 +protocol extension was not very popular.

244

245 * cc/bisect-replace (Mon Nov 24 22:20:30 2008 +0100) 9 commits

246 - bisect: add "--no-replace" option to bisect without using replace

@@ -215,19 +256,13 @@ HEAD on the origin site points to more robust.

256 - bisect: add test cases for "git bisect replace"

257 - bisect: add "git bisect replace" subcommand

258

218 -I think a mechanism like this should be added to replace grafts, but it

219 -should always be enabled for normal revision traversal operation, while

220 -always disabled for object enumeration and transfer operation (iow, fsck,

221 -fetch and push should use the real ancestry information recorded in the

222 -underlying objects, while rev-list, log, etc. should always use the

223 -replaced objects). I have a suspicion that even cat-file could honor it.

259 +Will drop and replace it with the resubmitted series when it comes.

260

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

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

263

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

229 -Someone needs to pick up this topic and resolve the deadlock before it can

230 -continue.

265 +Will drop shortly.

266

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

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

@@ -245,3 +280,4 @@ this back for now.

280 - stripspace: use parse_options()

281 - Add "git am -s" test

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

283 +

What's cooking (2009/01 #01)