58c319780a · matheusbsbs/matheus-bagliano

@@ -1,4 +1,4 @@

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

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

2 --------------------------------------------------------

3

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

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

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

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

10

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

12 -talking about closing the merge window for 1.6.0.

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

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

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

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

15

16 ----------------------------------------------------------------

17 [New Topics]

18

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

20 +

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

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

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

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

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

26 +

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

28 + + git-rebase: report checkout failure

29 +

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

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

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

33 +

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

35 +quite straightforward and obvious code change.

36 +

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

38 + + archive: remove extra arguments parsing code

39 + + archive: unify file attribute handling

40 + + archive: centralize archive entry writing

41 + + archive: add baselen member to struct archiver_args

42 + + add context pointer to read_tree_recursive()

43 + + archive: remove args member from struct archiver

44 +

45 +----------------------------------------------------------------

46 +[Will merge to master soon]

47 +

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

18 - - Make usage strings dash-less

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

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

49 + + Make usage strings dash-less

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

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

52 test_must_fail

53

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

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

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

56 just to builtins

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

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

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

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

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

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

60 +

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

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

63 + + Add some useful functions for strbuf manipulation.

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

65 +

66 +----------------------------------------------------------------

67 +[Graduated to "master"]

68

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

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

71

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

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

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

74 almost forever.

75

@@ -51,45 +90,17 @@ almost forever.

90 + rerere: Separate libgit and builtin functions

91 + builtin-rerere: more carefully find conflict markers

92

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

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

56 - - Add some useful functions for strbuf manipulation.

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

58 -

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

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

61 -

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

63 -

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

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

95 .mailmap

96

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

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

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

71 - invocation path

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

73 - invocation

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

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

99 shell API

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

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

102 system_path()

103

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

81 -later ones that are in 'pu'.

82 -

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

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

85 - - Add new Git::Repo API

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

87 -

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

89 -

90 -----------------------------------------------------------------

91 -[Will merge to master soon]

92 -

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

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

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

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

111 + branch --contains: default to HEAD

112 + parse-options: add PARSE_OPT_LASTARG_DEFAULT flag

113

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

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

105 -

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

115 + builtin-rerere: more carefully find conflict markers

116

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

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

119 line

120

113 -----------------------------------------------------------------

114 -[Actively Cooking]

115 -

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

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

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

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

120 - machinery

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

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

122 + + reduce_heads(): protect from duplicate input

123 + + reduce_heads(): thinkofix

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

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

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

127 + + Build in merge

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

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

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

131 + message

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

133 + possible

134 + + Introduce reduce_heads()

135 + + Introduce get_merge_bases_many()

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

137 + + Introduce get_octopus_merge_bases() in commit.c

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

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

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

141 + pull.octopus

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

143 + + Move commit_list_count() to commit.c

144 + + Move split_cmdline() to alias.c

145

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

146 +----------------------------------------------------------------

147 +[On Hold]

148

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

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

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

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

160 top of this series.

161

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

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

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

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

166 + machinery

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

168 +

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

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

171 +

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

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

174 recursive.

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

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

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

185

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

153 - + reduce_heads(): thinkofix

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

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

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

157 - + Build in merge

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

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

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

161 - message

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

163 - possible

164 - + Introduce reduce_heads()

165 - + Introduce get_merge_bases_many()

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

167 - + Introduce get_octopus_merge_bases() in commit.c

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

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

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

171 - pull.octopus

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

173 - + Move commit_list_count() to commit.c

174 - + Move split_cmdline() to alias.c

175 -

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

177 -I haven't looked at.

178 -

179 -----------------------------------------------------------------

180 -[Graduated to "master"]

181 -

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

183 - + Allow cherry-picking root commits

184 -

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

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

187 - rev-list.

188 -

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

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

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

192 -

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

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

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

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

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

198 -working tree to be tested and then committed.

199 -

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

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

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

203 -

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

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

206 -

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

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

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

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

211 -

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

213 -

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

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

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

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

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

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

220 -

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

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

223 -

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

225 - + revisions: refactor handle_revision_opt into parse_revision_opt.

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

227 - + git-blame: fix lapsus

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

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

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

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

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

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

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

235 - intead.

236 - + parse-opt: create parse_options_step.

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

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

239 - + git-blame --reverse

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

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

242 - + rev-list --children

243 - + revision traversal: --children option

244 -

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

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

247 -used heavily in production yet.

248 -

249 -----------------------------------------------------------------

250 -[On Hold]

251 -

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

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

188 variables

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

210 ----------------------------------------------------------------

211 [Stalled/Needs more work]

212

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

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

215 +

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

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

218 + . Add new Git::Repo API

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

220 +

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

222 . Migrate git-am to use git-sequencer

223 . Add git-sequencer test suite (t3350)

@@ -300,4 +242,3 @@ commits that are mentioned in grafts as reachable.

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

243 may not help applications like gitweb.

244

303 -