55d7037d13 · matheusbsbs/matheus-bagliano

@@ -1,6 +1,6 @@

1 -Subject: What's cooking in git.git (Jul 2008, issue #05; Sun, 13)

1 +Subject: What's cooking in git.git (Jul 2008, issue #06; Tue, 15)

2

3 -What's cooking in git.git (Jul 2008, issue #05; Sun, 13)

3 +What's cooking in git.git (Jul 2008, issue #06; Tue, 15)

4 --------------------------------------------------------

5

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

@@ -10,29 +10,68 @@ in 'next'.

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

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

12

13 -I think most of the important stuff is already in 'next'. Let's start

14 -talking about closing the merge window for 1.6.0.

13 +It so happens that the topics clearly separated between the ones that are

14 +obviously ready for 1.6.0 and the others that aren't yet as of tonight.

15 +It seems that it is a good time to draw that line and tag -rc0 tomorrow,

16 +after merging the remaining topics in 'next'.

17

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

19 [New Topics]

20

21 +I could apply these directly to master, but I am just playing it safe.

22 +

23 +* sp/maint-index-pack (Tue Jul 15 04:45:34 2008 +0000) 4 commits

24 + + index-pack: Honor core.deltaBaseCacheLimit when resolving deltas

25 + + index-pack: Track the object_entry that creates each base_data

26 + + index-pack: Chain the struct base_data on the stack for traversal

27 + + index-pack: Refactor base arguments of resolve_delta into a struct

28 +

29 +* rs/rebase-checkout-not-so-quiet (Mon Jul 14 14:05:35 2008 -0700) 1 commit

30 + + git-rebase: report checkout failure

31 +

32 +* ag/blame (Wed Jul 16 02:00:58 2008 +0400) 2 commits

33 + + Do not try to detect move/copy for entries below threshold.

34 + + Avoid rescanning unchanged entries in search for copies.

35 +

36 +This gives a drastic performance improvement to "git-blame -C -C" with

37 +quite straightforward and obvious code change.

38 +

39 +* rs/archive (Mon Jul 14 21:22:05 2008 +0200) 6 commits

40 + + archive: remove extra arguments parsing code

41 + + archive: unify file attribute handling

42 + + archive: centralize archive entry writing

43 + + archive: add baselen member to struct archiver_args

44 + + add context pointer to read_tree_recursive()

45 + + archive: remove args member from struct archiver

46 +

47 +----------------------------------------------------------------

48 +[Will merge to master soon]

49 +

50 * sb/dashless (Sun Jul 13 15:36:15 2008 +0200) 3 commits

20 - - Make usage strings dash-less

21 - - t/: Use "test_must_fail git" instead of "! git"

22 - - t/test-lib.sh: exit with small negagive int is ok with

51 + + Make usage strings dash-less

52 + + t/: Use "test_must_fail git" instead of "! git"

53 + + t/test-lib.sh: exit with small negagive int is ok with

54 test_must_fail

55

56 * mv/dashless (Fri Jul 11 02:12:06 2008 +0200) 4 commits

26 - - make remove-dashes: apply to scripts and programs as well, not

57 + + make remove-dashes: apply to scripts and programs as well, not

58 just to builtins

28 - - git-bisect: use dash-less form on git bisect log

29 - - t1007-hash-object.sh: use quotes for the test description

30 - - t0001-init.sh: change confusing directory name

59 + + git-bisect: use dash-less form on git bisect log

60 + + t1007-hash-object.sh: use quotes for the test description

61 + + t0001-init.sh: change confusing directory name

62 +

63 +* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits

64 + + git-mailinfo: use strbuf's instead of fixed buffers

65 + + Add some useful functions for strbuf manipulation.

66 + + Make some strbuf_*() struct strbuf arguments const.

67 +

68 +----------------------------------------------------------------

69 +[Graduated to "master"]

70

71 * sp/maint-bash-completion-optim (Mon Jul 14 00:22:03 2008 +0000) 1 commit

72 + bash completion: Append space after file names have been completed

73

35 -Early parts are already merged to 'master' and need to be merged down to

74 +Early parts were already merged to 'master' and need to be merged down to

75 maint as well, as this is about a "performance bug" that has been with us

76 almost forever.

77

@@ -53,45 +92,17 @@ almost forever.

92 + rerere: Separate libgit and builtin functions

93 + builtin-rerere: more carefully find conflict markers

94

56 -* ls/mailinfo (Sun Jul 13 20:30:12 2008 +0200) 3 commits

57 - - git-mailinfo: use strbuf's instead of fixed buffers

58 - - Add some useful functions for strbuf manipulation.

59 - - Make some strbuf_*() struct strbuf arguments const.

60 -

61 -* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit

62 - - cherry: cache patch-ids to avoid repeating work

63 -

64 -This does not seem to pass tests even on its own.

65 -

95 * js/maint-pretty-mailmap (Sat Jul 12 00:28:18 2008 +0100) 1 commit

96 + Add pretty format %aN which gives the author name, respecting

97 .mailmap

98

70 -* js/more-win (Sun Jul 13 22:31:23 2008 +0200) 6 commits

71 - - Allow add_path() to add non-existent directories to the path

72 - - Allow the built-in exec path to be relative to the command

73 - invocation path

74 - - Fix relative built-in paths to be relative to the command

75 - invocation

99 +* js/more-win (Sun Jul 13 22:31:23 2008 +0200) 3 commits

100 + help (Windows): Display HTML in default browser using Windows'

101 shell API

102 + help.c: Add support for htmldir relative to git_exec_path()

103 + Move code interpreting path relative to exec-dir to new function

104 system_path()

105

82 -The earlier parts are obvious; Dscho seemed to have some comments on the

83 -later ones that are in 'pu'.

84 -

85 -* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits

86 - - gitweb: use new Git::Repo API, and add optional caching

87 - - Add new Git::Repo API

88 - - gitweb: add test suite with Test::WWW::Mechanize::CGI

89 -

90 -This does not pass t9710, at least for me X-<.

91 -

92 -----------------------------------------------------------------

93 -[Will merge to master soon]

94 -

106 * jc/rebase-orig-head (Tue Jul 8 00:12:22 2008 -0400) 2 commits

107 + Documentation: mention ORIG_HEAD in am, merge, and rebase

108 + Teach "am" and "rebase" to mark the original position with

@@ -102,9 +113,6 @@ This does not pass t9710, at least for me X-<.

113 + branch --contains: default to HEAD

114 + parse-options: add PARSE_OPT_LASTARG_DEFAULT flag

115

105 -This builds on top of the parse-options enhancement series that

106 -has been cooking in 'next' for some time.

107 -

116 * om/rerere-careful (Mon Jul 7 14:42:48 2008 +0200) 1 commit

117 + builtin-rerere: more carefully find conflict markers

118

@@ -112,17 +120,33 @@ has been cooking in 'next' for some time.

120 + git-mailinfo: Fix getting the subject from the in-body [PATCH]

121 line

122

115 -----------------------------------------------------------------

116 -[Actively Cooking]

117 -

118 -* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits

119 - + Teach git-merge -X<option> again.

120 - + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next

121 - + builtin-merge.c: use parse_options_step() "incremental parsing"

122 - machinery

123 - + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next

123 +* mv/merge-in-c (Mon Jul 14 00:09:41 2008 -0700) 20 commits

124 + + reduce_heads(): protect from duplicate input

125 + + reduce_heads(): thinkofix

126 + + Add a new test for git-merge-resolve

127 + + t6021: add a new test for git-merge-resolve

128 + + Teach merge.log to "git-merge" again

129 + + Build in merge

130 + + Fix t7601-merge-pull-config.sh on AIX

131 + + git-commit-tree: make it usable from other builtins

132 + + Add new test case to ensure git-merge prepends the custom merge

133 + message

134 + + Add new test case to ensure git-merge reduces octopus parents when

135 + possible

136 + + Introduce reduce_heads()

137 + + Introduce get_merge_bases_many()

138 + + Add new test to ensure git-merge handles more than 25 refs.

139 + + Introduce get_octopus_merge_bases() in commit.c

140 + + git-fmt-merge-msg: make it usable from other builtins

141 + + Move read_cache_unmerged() to read-cache.c

142 + + Add new test to ensure git-merge handles pull.twohead and

143 + pull.octopus

144 + + Move parse-options's skip_prefix() to git-compat-util.h

145 + + Move commit_list_count() to commit.c

146 + + Move split_cmdline() to alias.c

147

125 -I've described what this is in a separate message.

148 +----------------------------------------------------------------

149 +[On Hold]

150

151 * rs/imap (Wed Jul 9 22:29:02 2008 +0100) 5 commits

152 - Documentation: Improve documentation for git-imap-send(1)

@@ -137,6 +161,16 @@ If such a patch materializes soon, that would be good, but otherwise I'll

161 merge this as-is to 'next'. Such an enhancement can be done in-tree on

162 top of this series.

163

164 +* xx/merge-in-c-into-next (Wed Jul 9 13:51:46 2008 -0700) 4 commits

165 + + Teach git-merge -X<option> again.

166 + + Merge branch 'jc/merge-theirs' into xx/merge-in-c-into-next

167 + + builtin-merge.c: use parse_options_step() "incremental parsing"

168 + machinery

169 + + Merge branch 'ph/parseopt-step-blame' into xx/merge-in-c-into-next

170 +

171 +This needs to be merged to master iff/when merge-theirs gets merged,

172 +but I do not think this series is widely supported, so both are on hold.

173 +

174 * jc/merge-theirs (Mon Jun 30 22:18:57 2008 -0700) 5 commits

175 + Make "subtree" part more orthogonal to the rest of merge-

176 recursive.

@@ -151,106 +185,6 @@ will result in nonsense mishmash, but somehow often people want this, so

185 here they are. The interface to the backends is updated so that you can

186 say "git merge -Xours -Xsubtree=foo/bar/baz -s recursive other" now.

187

154 -* mv/merge-in-c (Sun Jul 13 08:13:55 2008 +0000) 19 commits

155 - + reduce_heads(): thinkofix

156 - + Add a new test for git-merge-resolve

157 - + t6021: add a new test for git-merge-resolve

158 - + Teach merge.log to "git-merge" again

159 - + Build in merge

160 - + Fix t7601-merge-pull-config.sh on AIX

161 - + git-commit-tree: make it usable from other builtins

162 - + Add new test case to ensure git-merge prepends the custom merge

163 - message

164 - + Add new test case to ensure git-merge reduces octopus parents when

165 - possible

166 - + Introduce reduce_heads()

167 - + Introduce get_merge_bases_many()

168 - + Add new test to ensure git-merge handles more than 25 refs.

169 - + Introduce get_octopus_merge_bases() in commit.c

170 - + git-fmt-merge-msg: make it usable from other builtins

171 - + Move read_cache_unmerged() to read-cache.c

172 - + Add new test to ensure git-merge handles pull.twohead and

173 - pull.octopus

174 - + Move parse-options's skip_prefix() to git-compat-util.h

175 - + Move commit_list_count() to commit.c

176 - + Move split_cmdline() to alias.c

177 -

178 -Sverre seems to have a yet another fixup on top of this that came late and

179 -I haven't looked at.

180 -

181 -----------------------------------------------------------------

182 -[Graduated to "master"]

183 -

184 -* js/pick-root (Fri Jul 4 16:19:52 2008 +0100) 1 commit

185 - + Allow cherry-picking root commits

186 -

187 -* ab/bundle (Sat Jul 5 17:26:40 2008 -0400) 1 commit

188 - + Teach git-bundle to read revision arguments from stdin like git-

189 - rev-list.

190 -

191 -* sg/stash-k-i (Tue Jul 8 00:40:56 2008 -0700) 2 commits

192 - + Documentation: tweak use case in "git stash save --keep-index"

193 - + stash: introduce 'stash save --keep-index' option

194 -

195 -One weakness of our "partial commit" workflow support used to be that the

196 -user can incrementally build what is to be committed in the index but that

197 -state cannot be tested as a whole in the working tree. This allows you to

198 -temporarily stash the remaining changes in the working tree so that the

199 -index state before running "stash save --keep-index" can be seen in the

200 -working tree to be tested and then committed.

201 -

202 -* am/stash-branch (Mon Jul 7 02:50:10 2008 +0530) 2 commits

203 - + Add a test for "git stash branch"

204 - + Implement "git stash branch <newbranch> <stash>"

205 -

206 -Creates a new branch out of the stashed state, after returning from the

207 -interrupt that forced you to create the stash in the first place.

208 -

209 -* tr/add-i-e (Thu Jul 3 00:00:00 2008 +0200) 3 commits

210 - + git-add--interactive: manual hunk editing mode

211 - + git-add--interactive: remove hunk coalescing

212 - + git-add--interactive: replace hunk recounting with apply --recount

213 -

214 -Adds 'e/dit' action to interactive add command.

215 -

216 -* jc/report-tracking (Sun Jul 6 02:54:56 2008 -0700) 5 commits

217 - + branch -r -v: do not spit out garbage

218 - + stat_tracking_info(): clear object flags used during counting

219 - + git-branch -v: show the remote tracking statistics

220 - + git-status: show the remote tracking statistics

221 - + Refactor "tracking statistics" code used by "git checkout"

222 -

223 -Makes the "your branch is ahead of the tracked one by N commits" logic and

224 -messages available to other commands; status and branch are updated.

225 -

226 -* ph/parseopt-step-blame (Wed Jul 9 23:38:34 2008 +0200) 18 commits

227 - + revisions: refactor handle_revision_opt into parse_revision_opt.

228 - + git-shortlog: migrate to parse-options partially.

229 - + git-blame: fix lapsus

230 - + git-blame: migrate to incremental parse-option [2/2]

231 - + git-blame: migrate to incremental parse-option [1/2]

232 - + revisions: split handle_revision_opt() from setup_revisions()

233 - + Merge branch 'jc/blame' (early part) into HEAD

234 - + parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.

235 - + parse-opt: fake short strings for callers to believe in.

236 - + parse-opt: do not print errors on unknown options, return -2

237 - intead.

238 - + parse-opt: create parse_options_step.

239 - + parse-opt: Export a non NORETURN usage dumper.

240 - + parse-opt: have parse_options_{start,end}.

241 - + git-blame --reverse

242 - + builtin-blame.c: allow more than 16 parents

243 - + builtin-blame.c: move prepare_final() into a separate function.

244 - + rev-list --children

245 - + revision traversal: --children option

246 -

247 -Became active again ;-) This probably is ready for 'master' already,

248 -except for the last two which I only looked at the patch and have not

249 -used heavily in production yet.

250 -

251 -----------------------------------------------------------------

252 -[On Hold]

253 -

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

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

190 variables

@@ -278,6 +212,14 @@ hit due to tcl/tk's limitation, so I am holding this back for now.

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

213 [Stalled/Needs more work]

214

215 +* gi/cherry-cache (Sat Jul 12 20:14:51 2008 -0700) 1 commit

216 + . cherry: cache patch-ids to avoid repeating work

217 +

218 +* lw/gitweb (Fri Jul 11 03:11:48 2008 +0200) 3 commits

219 + . gitweb: use new Git::Repo API, and add optional caching

220 + . Add new Git::Repo API

221 + . gitweb: add test suite with Test::WWW::Mechanize::CGI

222 +

223 * sb/sequencer (Tue Jul 1 04:38:34 2008 +0200) 4 commits

224 . Migrate git-am to use git-sequencer

225 . Add git-sequencer test suite (t3350)

@@ -302,4 +244,3 @@ commits that are mentioned in grafts as reachable.

244 This is for peeling to see what's behind the blamed commit, which may or

245 may not help applications like gitweb.

246

305 -

What's cooking (2008/07 #06)