c58d77d896 · matheusbsbs/matheus-bagliano

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

1 -Subject: What's cooking in git.git (Jul 2008, issue #04; Wed, 09)

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

2

3 -What's cooking in git.git (Jul 2008, issue #04; Wed, 09)

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

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

5

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

@@ -8,48 +8,94 @@ with '-' are only in 'pu' while commits prefixed with '+' are

8 in 'next'.

9

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

11 -meant to be applied to the maintenance series have "maint-" in their

12 -names.

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

12

14 -It already is beginning to become clear what 1.6.0 will look like. What's

15 -already in 'next' all are well intentioned (I do not guarantee they are

16 -already bug-free --- that is what cooking them in 'next' is for) and are

17 -good set of feature enhancements. Bigger changes will be:

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.

15

19 - * Port for MinGW.

16 +----------------------------------------------------------------

17 +[New Topics]

18

21 - * With the default Makefile settings, most of the programs will be

22 - installed outside your $PATH, except for "git", "gitk", "git-gui" and

23 - some server side programs that need to be accessible for technical

24 - reasons. Invoking a git subcommand as "git-xyzzy" from the command

25 - line has been deprecated since early 2006 (and officially announced in

26 - 1.5.4 release notes); use of them from your scripts after adding

27 - output from "git --exec-path" to the $PATH will still be supported in

28 - 1.6.0, but users are again strongly encouraged to adjust their

29 - scripts to use "git xyzzy" form, as we will stop installing

30 - "git-xyzzy" hardlinks for built-in commands in later releases.

19 +* 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

23 + test_must_fail

24 +

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

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

27 + 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

31 +

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

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

34 +

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

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

37 +almost forever.

38 +

39 +* ag/rewrite_one (Sat Jul 12 22:00:57 2008 +0400) 1 commit

40 + + Fix quadratic performance in rewrite_one.

41 +

42 +* sp/win (Fri Jul 11 18:52:42 2008 +0200) 3 commits

43 + + We need to check for msys as well as Windows in add--interactive.

44 + + Convert CR/LF to LF in tag signatures

45 + + Fixed text file auto-detection: treat EOF character 032 at the end

46 + of file as printable

47 +

48 +* js/merge-rr (Sat Jul 12 15:56:19 2008 +0100) 2 commits

49 + + Move MERGE_RR from .git/rr-cache/ into .git/

50 + + builtin-rerere: more carefully find conflict markers

51

32 - * git-merge will be rewritten in C.

52 +* sb/rerere-lib (Wed Jul 9 14:58:57 2008 +0200) 2 commits

53 + + rerere: Separate libgit and builtin functions

54 + + builtin-rerere: more carefully find conflict markers

55

34 - * default pack and idx versions will be updated as scheduled for some

35 - time ago.

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

37 - * GIT_CONFIG, which was only documented as affecting "git config", but

38 - actually affected all git commands, now only affects "git config".

39 - GIT_LOCAL_CONFIG, also only documented as affecting "git config" and

40 - not different from GIT_CONFIG in a useful way, is removed.

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

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

63

42 -----------------------------------------------------------------

43 -[New Topics]

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

65

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

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

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

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

49 - machinery

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

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

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

68 + .mailmap

69

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

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

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

77 + shell API

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

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

80 + system_path()

81 +

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 +

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

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

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

98 + ORIG_HEAD

99

100 * jc/branch-merged (Tue Jul 8 17:55:47 2008 -0700) 3 commits

101 + branch --merged/--no-merged: allow specifying arbitrary commit

@@ -59,19 +105,81 @@ I've described what this is in a separate message.

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

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

107

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

109 + + builtin-rerere: more carefully find conflict markers

110 +

111 +* ls/maint-mailinfo-patch-label (Thu Jul 10 23:41:33 2008 +0200) 1 commit

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

113 + line

114 +

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

124 +

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

126 +

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

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

64 - + imap-send.c: more style fixes

65 - + imap-send.c: style fixes

66 - + git-imap-send: Support SSL

67 - + git-imap-send: Allow the program to be run from subdirectories of

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

129 + - imap-send.c: more style fixes

130 + - imap-send.c: style fixes

131 + - git-imap-send: Support SSL

132 + - git-imap-send: Allow the program to be run from subdirectories of

133 a git tree

134

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

71 - + builtin-rerere: more carefully find conflict markers

135 +Some people seem to prefer having this feature available also with gnutls.

136 +If such a patch materializes soon, that would be good, but otherwise I'll

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

138 +top of this series.

139 +

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

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

142 + recursive.

143 + + Teach git-pull to pass -X<option> to git-merge

144 + + Teach git-merge to pass -X<option> to the backend strategy module

145 + + git-merge-recursive-{ours,theirs}

146 + + git-merge-file --ours, --theirs

147 +

148 +Punting a merge by discarding your own work in conflicting parts but still

149 +salvaging the parts that are cleanly automerged. It is likely that this

150 +will result in nonsense mishmash, but somehow often people want this, so

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

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

153 +

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

74 -[Will merge to master soon]

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

@@ -115,14 +223,6 @@ Adds 'e/dit' action to interactive add command.

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

118 -----------------------------------------------------------------

119 -[Actively Cooking]

120 -

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

122 - + Documentation: mention ORIG_HEAD in am, merge, and rebase

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

124 - ORIG_HEAD

125 -

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.

@@ -148,61 +248,6 @@ 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

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

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

153 - recursive.

154 - + Teach git-pull to pass -X<option> to git-merge

155 - + Teach git-merge to pass -X<option> to the backend strategy module

156 - + git-merge-recursive-{ours,theirs}

157 - + git-merge-file --ours, --theirs

158 -

159 -Punting a merge by discarding your own work in conflicting parts but still

160 -salvaging the parts that are cleanly automerged. It is likely that this

161 -will result in nonsense mishmash, but somehow often people want this, so

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

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

164 -

165 -* mv/merge-in-c (Mon Jul 7 19:24:20 2008 +0200) 15 commits

166 - + Build in merge

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

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

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

170 - message

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

172 - possible

173 - + Introduce reduce_heads()

174 - + Introduce get_merge_bases_many()

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

176 - + Introduce get_octopus_merge_bases() in commit.c

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

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

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

180 - pull.octopus

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

182 - + Move commit_list_count() to commit.c

183 - + Move split_cmdline() to alias.c

184 -

185 -----------------------------------------------------------------

186 -[Graduated to "master"]

187 -

188 -* js/apply-root (Sun Jul 6 18:36:01 2008 -0700) 3 commits

189 - + git-apply --directory: make --root more similar to GNU diff

190 - + apply --root: thinkofix.

191 - + Teach "git apply" to prepend a prefix with "--root=<root>"

192 -

193 -* jc/reflog-expire (Sat Jun 28 22:24:49 2008 -0700) 2 commits

194 - + Make default expiration period of reflog used for stash infinite

195 - + Per-ref reflog expiry configuration

196 -

197 -As 1.6.0 will be a good time to make backward incompatible changes, the

198 -tip commit makes the default expiry period of stash 'never', unless you

199 -configure them to expire explicitly using gc.refs/stash.* variables.

200 -Needs consensus, but I am guessing that enough people would want stash

201 -that does not expire.

202 -

203 -* jk/pager-config (Thu Jul 3 07:46:57 2008 -0400) 1 commit

204 - + Allow per-command pager config

205 -

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

252 [On Hold]

253

@@ -249,22 +294,12 @@ need these to pass fsck. This fixes object transfer to ignore grafts.

294 Another fix is needed to git-prune so that it ignores grafts but treats

295 commits that are mentioned in grafts as reachable.

296

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

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

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

299 format

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

256 - + git-blame --reverse

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

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

259 - + rev-list --children

260 - + revision traversal: --children option

301

262 -The blame that finds where each line in the original lines moved to. This

263 -may help a GSoC project that wants to gather statistical overview of the

264 -history. The final presentation may need tweaking (see the log message of

265 -the commit ""git-blame --reverse" on the series).

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

303 +may not help applications like gitweb.

304

267 -The tip two commits are for peeling to see what's behind the blamed

268 -commit, which we should be able to separate out into an independent topic

269 -from the rest.

305

What's cooking (2008/07 #05)