7fed771dc8 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Apr 2009, #04; Wed, 29)

3 -X-master-at: 6ffd567bec439e7809ee0966556bd5e72fb78de4

4 -X-next-at: 8c6980a6544dcc03e45b1d63d624544f3bfa1b94

2 +Subject: What's cooking in git.git (May 2009, #01; Sat, 09)

3 +X-master-at: 6345d7a0d151afc3d2a10ada3ecacf54c3fee2d0

4 +X-next-at: 99c766e3a22715646df19711aeaf76e0c938bacd

5

6 -What's cooking in git.git (Apr 2009, #04; Wed, 29)

6 +What's cooking in git.git (May 2009, #01; Sat, 09)

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

8

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

@@ -17,128 +17,70 @@ meant to be merged to the maintenance series have "maint-" in their names.

17 ----------------------------------------------------------------

18 [New Topics]

19

20 -* cc/bisect (Fri Apr 24 08:29:01 2009 +0200) 10 commits

21 - - am: simplify "sq" function by using "git rev-parse --sq-quote"

22 - - bisect: use "git rev-parse --sq-quote" instead of a custom "sq"

23 - function

24 - - rev-parse: add --sq-quote to shell quote arguments

25 - - rev-list: remove stringed output flag from "show_bisect_vars"

26 - - bisect--helper: remove "--next-vars" option as it is now useless

27 - - bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"

28 - - bisect--helper: add "--next-exit" to output bisect results

29 - - bisect: move common bisect functionality to "bisect_common"

30 - - rev-list: refactor printing bisect vars

31 - - rev-list: make "estimate_bisect_steps" non static

20 +* mt/submodule-reference (Mon May 4 22:30:01 2009 +0300) 1 commit

21 + + Add --reference option to git submodule.

22

33 -* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits

34 - + bash completion: show-branch color support

35 - + show-branch: color the commit status signs

23 +* rr/forbid-bs-in-ref (Fri May 8 07:32:37 2009 +0200) 1 commit

24 + + Disallow '\' in ref names

25

37 -* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit

38 - + graph API: Use horizontal lines for more compact graphs

26 +This retroactively forbids use of what people could have been using

27 +happily, which, strictly speaking, is a no-no, but makes sense in the

28 +longer term.

29

40 -* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit

41 - - Clarify kind of conflict in merge-one-file helper

30 +* jk/maint-add-empty (Tue Apr 28 23:21:01 2009 -0400) 1 commit

31 + - add: don't complain when adding empty project root

32

43 -* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit

44 - - diff: do not color --stat output like patch context

33 +When you say "git add ." in an empty directory, you get "No path matches

34 +''", instead of "No path matches '.'", and this "fixes" it by hiding the

35 +error and making the command silently succeed. Strictly speaking it

36 +introduces inconsistency, but I think an empty directory is so

37 +uninteresting special case that not signalling it as an error is Ok.

38

46 -* rc/http-push (Sat Apr 25 00:35:57 2009 +0800) 3 commits

47 - . http-push: send out fetch requests on queue

48 - . t5540-http-push: test fetching of packed objects

49 - . t5540-http-push: test fetching of loose objects

39 +Will merge to 'next'.

40

51 -Breaks build in a trivial way; which I haven't got around fixing it up.

41 +* lt/maint-diff-reduce-lstat (Sat May 9 15:11:17 2009 -0700) 2 commits

42 + + Teach 'git checkout' to preload the index contents

43 + + Avoid unnecessary 'lstat()' calls in 'get_stat_data()'

44

53 -* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit

54 - + fetch: Strip usernames from url's before storing them

45 +* jk/maint-1.6.0-trace-argv (Fri May 8 05:06:15 2009 -0400) 1 commit

46 + + fix GIT_TRACE segfault with shell-quoted aliases

47

56 -* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits

57 - - print unlink(2) errno in copy_or_link_directory

58 - - replace direct calls to unlink(2) with unlink_or_warn

59 - - Introduce an unlink(2) wrapper which gives warning if unlink

60 - failed

48 +* hv/sample-update (Fri May 8 17:22:30 2009 +0200) 1 commit

49 + + Extend sample update hook, disable modifying of existing tags

50

62 -* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit

63 - - git-submodule: add support for --rebase.

51 +* rs/grep-parseopt (Thu May 7 21:46:48 2009 +0200) 5 commits

52 + + grep: use parseopt

53 + + grep: remove global variable builtin_grep

54 + + parseopt: add PARSE_OPT_NODASH

55 + + parseopt: add OPT_NUMBER_CALLBACK

56 + + parseopt: add OPT_NEGBIT

57 +

58 +* do/maint-merge-recursive-fix (Sat May 9 14:49:59 2009 -0700) 1 commit

59 + + merge-recursive: never leave index unmerged while recursing

60 +

61 +* np/push-delta (Fri May 1 16:56:47 2009 -0400) 1 commit

62 + + allow OFS_DELTA objects during a push

63 +

64 +* jm/format-patch-no-auto-n-when-k-is-given (Sat May 9 10:12:01 2009 +0200) 1 commit

65 + + format-patch let -k override a config-specified format.numbered

66 +

67 +* da/mergetool-lib (Sat May 2 01:57:21 2009 -0700) 1 commit

68 + - mergetool--lib: specialize diff options for emerge and ecmerge

69 +

70 +* jk/no-no-no-empty-directory (Fri May 8 01:01:17 2009 -0400) 2 commits

71 + + parseopt: add OPT_NEGBIT

72 + + parseopt: add OPT_NEGBIT

73 +

74 +I somehow botched the commit log message of the top one; it is about

75 +fixing "ls-files --no-empty-directory".

76 +

77 +* fl/git-pm (Thu May 7 15:41:28 2009 +0200) 2 commits

78 + + Git.pm: Always set Repository to absolute path if autodetecting

79 + + Git.pm: Set GIT_WORK_TREE if we set GIT_DIR

80

81 ----------------------------------------------------------------

66 -[Graduated to "master"]

67 -

68 -It's been a while since I sent "What's cooking" out, and some of the

69 -topics below have fixes on top directly applied since they graduated.

70 -

71 -* ac/color-graph (Mon Apr 13 15:53:41 2009 -0400) 1 commit

72 - + graph API: Added logic for colored edges

73 -

74 -* jk/cobdoc (Mon Apr 13 07:21:04 2009 -0400) 5 commits

75 - + docs/checkout: clarify what "non-branch" means

76 - + doc/checkout: split checkout and branch creation in synopsis

77 - + doc/checkout: refer to git-branch(1) as appropriate

78 - + doc: refer to tracking configuration as "upstream"

79 - + doc: clarify --no-track option

80 -

81 -* mk/apply-swap (Sat Apr 11 21:31:00 2009 +0200) 2 commits

82 - + builtin-apply: keep information about files to be deleted

83 - + tests: test applying criss-cross rename patch

84 -

85 -Perhaps needs to be cherry-picked to 1.6.2.X series as well.

86 -

87 -* mm/add-p-quit (Fri Apr 10 16:57:01 2009 +0200) 1 commit

88 - + git add -p: new "quit" command at the prompt.

89 -

90 -* eb/upload-archive-from-git-shell (Thu Apr 9 21:58:52 2009 +0200) 1 commit

91 - + git-shell: Add 'git-upload-archive' to allowed commands.

92 -

93 -* jc/shared-literally (Sun Apr 12 17:55:18 2009 -0700) 2 commits

94 - + Mark t1301 permission test to depend on POSIXPERM

95 - + t1301-shared-repo: fix forced modes test

96 -

97 -* jc/maint-shared-literally (Sun Apr 12 21:22:02 2009 +0200) 1 commit

98 - + t1301-shared-repo: fix forced modes test

99 -

100 -* ns/am-to-empty (Fri Apr 10 09:34:42 2009 +0900) 1 commit

101 - + git-am: teach git-am to apply a patch to an unborn branch

102 -

103 -* bw/short-ref-strict (Mon Apr 13 13:20:26 2009 +0200) 3 commits

104 - + rev-parse: --abbrev-ref option to shorten ref name

105 - + for-each-ref: utilize core.warnAmbiguousRefs for :short-format

106 - + shorten_unambiguous_ref(): add strict mode

107 -

108 -* da/difftool (Sat Apr 11 20:41:56 2009 -0700) 16 commits

109 - + mergetool--lib: simplify API usage by removing more global

110 - variables

111 - + Fix misspelled mergetool.keepBackup

112 - + difftool/mergetool: refactor commands to use git-mergetool--lib

113 - + mergetool: use $( ... ) instead of `backticks`

114 - + bash completion: add git-difftool

115 - + difftool: add support for a difftool.prompt config variable

116 - + difftool: add various git-difftool tests

117 - + difftool: move 'git-difftool' out of contrib

118 - + difftool/mergetool: add diffuse as merge and diff tool

119 - + difftool: add a -y shortcut for --no-prompt

120 - + difftool: use perl built-ins when testing for msys

121 - + difftool: remove the backup file feature

122 - + difftool: remove merge options for opendiff, tkdiff, kdiff3 and

123 - xxdiff

124 - + git-mergetool: add new merge tool TortoiseMerge

125 - + git-mergetool/difftool: make (g)vimdiff workable under Windows

126 - + doc/merge-config: list ecmerge as a built-in merge tool

127 -

128 -* lt/bool-on-off (Thu Apr 9 12:40:39 2009 -0700) 1 commit

129 - + Allow users to un-configure rename detection

130 -

131 -* lt/pack-object-memuse (Fri Apr 10 18:15:26 2009 -0700) 2 commits

132 - + show_object(): push path_name() call further down

133 - + process_{tree,blob}: show objects without buffering

134 -

135 -* nd/archive-attribute (Mon Apr 13 14:18:39 2009 +0200) 5 commits

136 - + archive test: test new --fix-attributes feature

137 - + archive: do not read .gitattributes in working directory

138 - + unpack-trees: do not muck with attributes when we are not checking

139 - out

140 - + attr: add GIT_ATTR_INDEX "direction"

141 - + archive tests: do not use .gitattributes in working directory

82 +[Will merge to "master" soon]

83 +

84

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

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

@@ -203,19 +145,68 @@ in binary mode as well.

145 - cvsimport: extend testcase about patchset order to contain

146 branches

147 - cvsimport: add test illustrating a bug in cvsps

206 - + Add a test of "git cvsimport"'s handling of tags and branches

207 - + Add some tests of git-cvsimport's handling of vendor branches

208 - + Test contents of entire cvsimported "master" tree contents

209 - + Use CVS's -f option if available (ignore user's ~/.cvsrc file)

210 - + Start a library for cvsimport-related tests

211 -

212 -Two cvsimport test topics were rewound from 'next' and merged into this

213 -one. I'll keep this in 'pu' so that people can polish their cvsps skilz

214 -to resolve issues these tests identify.

148 + - Add a test of "git cvsimport"'s handling of tags and branches

149 + - Add some tests of git-cvsimport's handling of vendor branches

150 + - Test contents of entire cvsimported "master" tree contents

151 + - Use CVS's -f option if available (ignore user's ~/.cvsrc file)

152 + - Start a library for cvsimport-related tests

153

154 ----------------------------------------------------------------

155 [Actively cooking]

156

157 +* cc/bisect (Fri Apr 24 08:29:01 2009 +0200) 10 commits

158 + - am: simplify "sq" function by using "git rev-parse --sq-quote"

159 + - bisect: use "git rev-parse --sq-quote" instead of a custom "sq"

160 + function

161 + - rev-parse: add --sq-quote to shell quote arguments

162 + - rev-list: remove stringed output flag from "show_bisect_vars"

163 + - bisect--helper: remove "--next-vars" option as it is now useless

164 + - bisect: use "git bisect--helper --next-exit" in "git-bisect.sh"

165 + - bisect--helper: add "--next-exit" to output bisect results

166 + - bisect: move common bisect functionality to "bisect_common"

167 + - rev-list: refactor printing bisect vars

168 + - rev-list: make "estimate_bisect_steps" non static

169 +

170 +Will merge to 'next'.

171 +

172 +* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits

173 + + bash completion: show-branch color support

174 + + show-branch: color the commit status signs

175 +

176 +* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit

177 + + graph API: Use horizontal lines for more compact graphs

178 +

179 +* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit

180 + - Clarify kind of conflict in merge-one-file helper

181 +

182 +Will merge to 'next'.

183 +

184 +* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit

185 + - diff: do not color --stat output like patch context

186 +

187 +Will merge to 'next'.

188 +

189 +* rc/http-push (Sat Apr 25 00:35:57 2009 +0800) 3 commits

190 + - http-push: send out fetch requests on queue

191 + - t5540-http-push: test fetching of packed objects

192 + - t5540-http-push: test fetching of loose objects

193 +

194 +* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit

195 + + fetch: Strip usernames from url's before storing them

196 +

197 +* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits

198 + - print unlink(2) errno in copy_or_link_directory

199 + - replace direct calls to unlink(2) with unlink_or_warn

200 + - Introduce an unlink(2) wrapper which gives warning if unlink

201 + failed

202 +

203 +Will merge to 'next'.

204 +

205 +* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit

206 + - git-submodule: add support for --rebase.

207 +

208 +Will merge to 'next'.

209 +

210 * mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits

211 - send-email: Remove superfluous `my $editor = ...'

212 - send-email: 'References:' should only reference what is sent

@@ -228,6 +219,8 @@ to resolve issues these tests identify.

219 Only partially queued, but this is not 1.6.3 material and we are not in a

220 hurry.

221

222 +Will merge to 'next'.

223 +

224 * js/add-edit (Mon Apr 27 19:51:42 2009 +0200) 2 commits

225 + t3702: fix reliance on SHELL_PATH being '/bin/sh'

226 + git-add: introduce --edit (to edit the diff vs. the index)

@@ -251,18 +244,6 @@ hurry.

244 I suspect an attempt to replace an object that is directly listed on the

245 command line would not work very well with this series.

246

254 -----------------------------------------------------------------

255 -[Reverted]

256 -

257 -* mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits

258 - + Add a test of "git cvsimport"'s handling of tags and branches

259 - + Add some tests of git-cvsimport's handling of vendor branches

260 - + Test contents of entire cvsimported "master" tree contents

261 - + Use CVS's -f option if available (ignore user's ~/.cvsrc file)

262 - + Start a library for cvsimport-related tests

263 -

264 -This has been reverted out of 'next' for some time now.

265 -

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

248 [On Hold]

249

@@ -274,4 +255,5 @@ This has been reverted out of 'next' for some time now.

255 push

256

257 These are for 1.7.0, but the messages when they trigger together may need

277 -to be rethought.

258 +to be rethought. Will start merging them to 'next' shortly.

259 +

What's cooking (2009/05 #01)