8da3573960 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Mar 2009, #06; Sat, 21)

3 -X-master-at: a797b02f3925c4a6324472e2edaf4a58d4ffc097

4 -X-next-at: 5572a388cef2195e61894eec7976411776a95b39

2 +Subject: What's cooking in git.git (Mar 2009, #07; Mon, 30)

3 +X-master-at: 442dd42d6d4903640b0dc5561481a77c88dcea90

4 +X-next-at: 233382b233530fc38969fd1f31dec27e342c2a9f

5

6 -What's cooking in git.git (Mar 2009, #06; Sat, 21)

6 +What's cooking in git.git (Mar 2009, #07; Mon, 30)

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

8

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

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

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

18 [New Topics]

19

20 -* jk/reflog-date (Fri Mar 20 02:00:43 2009 -0400) 1 commit

21 - - make oneline reflog dates more consistent with multiline format

22 -

23 -* js/maint-1.6.0-exec-path-env (Wed Mar 18 08:42:53 2009 +0100) 1 commit

24 - - export GIT_EXEC_PATH when git is run with --exec-path

20 +* cj/doc-format (Fri Mar 27 00:36:47 2009 -0700) 11 commits

21 + + Merge branch 'cj/doc-quiet' into cj/doc-format

22 + + Documentation: option to render literal text as bold for manpages

23 + + Documentation: asciidoc.conf: fix verse block with block titles

24 + + Documentation: asciidoc.conf: always use <literallayout> for

25 + [blocktext]

26 + + Documentation: move "spurious .sp" code into manpage-base.xsl

27 + + Documentation: move quieting params into manpage-base.xsl

28 + + Documentation: rename docbook-xsl-172 attribute to git-asciidoc-

29 + no-roff

30 + + Documentation: use parametrized manpage-base.xsl with manpage-

31 + {1.72,normal}.xsl

32 + + Documentation: move callouts.xsl to manpage-{base,normal}.xsl

33 + + Documentation/Makefile: break up texi pipeline

34 + + Documentation/Makefile: make most operations "quiet"

35 +

36 +* cj/doc-quiet (Fri Mar 27 01:49:39 2009 -0500) 2 commits

37 + + Documentation/Makefile: break up texi pipeline

38 + + Documentation/Makefile: make most operations "quiet"

39 +

40 +I think these are ready for 'master'.

41 +

42 +* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 3 commits

43 + - checkout -: make "-" to mean "previous branch" everywhere

44 + - Don't permit ref/branch names to end with ".lock"

45 + - check_ref_format(): tighten refname rules

46 +

47 +After all the bottom two are probably not so iffy.

48 +

49 +* jc/name-branch (Sat Mar 21 14:35:51 2009 -0700) 5 commits

50 + + strbuf_check_branch_ref(): a helper to check a refname for a

51 + branch

52 + + Fix branch -m @{-1} newname

53 + + check-ref-format --branch: give Porcelain a way to grok branch

54 + shorthand

55 + + strbuf_branchname(): a wrapper for branch name shorthands

56 + + Rename interpret/substitute nth_last_branch functions

57 +

58 +* sb/format-patch-patchname (Fri Mar 27 01:13:01 2009 +0100) 7 commits

59 + + log-tree: fix patch filename computation in "git format-patch"

60 + + format-patch: --numbered-files and --stdout aren't mutually

61 + exclusive

62 + + format-patch: --attach/inline uses filename instead of SHA1

63 + + format-patch: move get_patch_filename() into log-tree

64 + + format-patch: pass a commit to reopen_stdout()

65 + + format-patch: construct patch filename in one function

66 + + pretty.c: add %f format specifier to format_commit_message()

67 +

68 +* mg/tracked-local-branches (Thu Mar 26 21:53:25 2009 +0100) 2 commits

69 + - [Reroll requested] Make local branches behave like remote branches

70 + when --tracked

71 + - Test for local branches being followed with --track

72 +

73 +* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 15 commits

74 + - bisect--helper: string output variables together with "&&"

75 + - rev-list: pass "int flags" as last argument of "show_bisect_vars"

76 + - t6030: test bisecting with paths

77 + - bisect: use "bisect--helper" and remove "filter_skipped" function

78 + - bisect: implement "read_bisect_paths" to read paths in

79 + "$GIT_DIR/BISECT_NAMES"

80 + - bisect--helper: implement "git bisect--helper"

81 + - rev-list: call new "filter_skip" function

82 + + rev-list: pass "revs" to "show_bisect_vars"

83 + + rev-list: make "show_bisect_vars" non static

84 + + rev-list: move code to show bisect vars into its own function

85 + + rev-list: move bisect related code into its own file

86 + + rev-list: make "bisect_list" variable local to "cmd_rev_list"

87 + + refs: add "for_each_ref_in" function to refactor "for_each_*_ref"

88 + functions

89 + + quote: add "sq_dequote_to_argv" to put unwrapped args in an argv

90 + array

91 + + quote: implement "sq_dequote_many" to unwrap many args in one

92 + string

93 +

94 +I've reordered them to make the early three patches independent to the

95 +rest of the series. Dscho had a suggestion on the search it internally

96 +does, so we might see further reroll of some patches in the series.

97 +

98 +* jc/shared-literally (Fri Mar 27 23:21:00 2009 -0700) 4 commits

99 + + set_shared_perm(): sometimes we know what the final mode bits

100 + should look like

101 + + move_temp_to_file(): do not forget to chmod() in "Coda hack"

102 + codepath

103 + + Move chmod(foo, 0444) into move_temp_to_file()

104 + + "core.sharedrepository = 0mode" should set, not loosen

105 +

106 +* tr/maint-1.6.1-doc-format-patch--root (Thu Mar 26 18:29:25 2009 +0100) 1 commit

107 + + Documentation: format-patch --root clarifications

108 +

109 +* mh/format-patch-add-header (Thu Mar 26 10:51:05 2009 -0600) 1 commit

110 + + format-patch: add arbitrary email headers

111 +

112 +* ef/fast-export (Mon Mar 23 12:53:09 2009 +0000) 4 commits

113 + + builtin-fast-export.c: handle nested tags

114 + + builtin-fast-export.c: fix crash on tagged trees

115 + + builtin-fast-export.c: turn error into warning

116 + + test-suite: adding a test for fast-export with tag variants

117

26 -* da/difftool (Thu Mar 19 01:25:25 2009 -0700) 1 commit

27 - - difftool: move 'git-difftool' out of contrib

118 +----------------------------------------------------------------

119 +[Graduated to "master"]

120

29 -* jc/maint-1.6.0-keep-pack (Thu Mar 19 22:47:54 2009 -0500) 4 commits

30 - - Remove --kept-pack-only option and associated infrastructure

31 - - pack-objects: only repack or loosen objects residing in "local"

32 - packs

33 - - git-repack.sh: don't use --kept-pack-only option to pack-objects

34 - - t7700-repack: add two new tests demonstrating repacking flaws

121 +* jk/reflog-date (Fri Mar 20 02:00:43 2009 -0400) 1 commit

122 + + make oneline reflog dates more consistent with multiline format

123

36 -Brandon Casey fixed the regression previous patches introduced; thanks.

124 +* js/maint-1.6.0-exec-path-env (Wed Mar 18 08:42:53 2009 +0100) 1 commit

125 + + export GIT_EXEC_PATH when git is run with --exec-path

126

127 * jc/maint-1.6.0-blame-s (Wed Mar 18 00:13:03 2009 -0700) 1 commit

39 - - blame: read custom grafts given by -S before calling

128 + + blame: read custom grafts given by -S before calling

129 setup_revisions()

130

131 The above are all ready for 'next'.

132

44 -* hv/cvsps-tests (Wed Mar 18 18:33:41 2009 +0100) 7 commits

45 - - cvsimport: extend testcase about patchset order to contain

46 - branches

47 - - cvsimport: add test illustrating a bug in cvsps

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

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

50 - - Test contents of entire cvsimported "master" tree contents

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

52 - - Start a library for cvsimport-related tests

53 -

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

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

56 -to resolve issues these tests identify.

57 -

58 -----------------------------------------------------------------

59 -[Graduated to "master"]

60 -

61 -* fc/parseopt-config (Tue Mar 17 10:46:37 2009 +0100) 10 commits

62 - + config: test for --replace-all with one argument and fix

63 - documentation.

64 - + config: set help text for --bool-or-int

65 - + git config: don't allow --get-color* and variable type

66 - + git config: don't allow extra arguments for -e or -l.

67 - + git config: don't allow multiple variable types

68 - + git config: don't allow multiple config file locations

69 - + git config: reorganize to use parseopt

70 - + git config: reorganize get_color*

71 - + git config: trivial rename in preparation for parseopt

72 - + git_config(): not having a per-repo config file is not an error

73 -

74 -* js/rebase-i-opt (Tue Mar 3 10:55:31 2009 +0100) 1 commit

75 - + rebase -i: avoid 'git reset' when possible

76 -

77 -* jc/clone-branch-rebase (Tue Mar 10 01:20:42 2009 -0700) 2 commits

78 - + Improve "git branch --tracking" output

79 - + Make git-clone respect branch.autosetuprebase

80 -

81 -This is a rewrite of a patch from Pat Notz.

82 -

83 -* xx/db-refspec-vs-js-remote (Sun Mar 8 00:12:33 2009 -0800) 1 commit

84 - + Adjust js/remote-improvements and db/refspec-wildcard-in-the-

85 - middle

86 -

87 -* db/refspec-wildcard-in-the-middle (Sat Mar 7 01:11:39 2009 -0500) 5 commits

88 - + Support '*' in the middle of a refspec

89 - + Keep '*' in pattern refspecs

90 - + Use the matching function to generate the match results

91 - + Use a single function to match names against patterns

92 - + Make clone parse the default refspec with the normal code

93 -

94 -* bw/autoconf (Thu Mar 12 15:20:12 2009 -0400) 7 commits

95 - + configure: rework pthread handling to allow for user defined flags

96 - + configure: make iconv tests aware of user arguments

97 - + configure: asciidoc version test cleanup

98 - + configure: wrap some library tests with GIT_STASH_FLAGS

99 - + configure: add macros to stash FLAG variables

100 - + configure: reorganize flow of argument checks

101 - + configure: ensure settings from user are also usable in the script

102 -

103 -* mv/parseopt-ls-files (Sat Mar 7 20:27:22 2009 -0500) 4 commits

104 - + ls-files: fix broken --no-empty-directory

105 - + t3000: use test_cmp instead of diff

106 - + parse-opt: migrate builtin-ls-files.

107 - + Turn the flags in struct dir_struct into a single variable

108 -

109 -The tip one was a subject for further discussion, but nothing is queued

110 -yet.

111 -

112 -----------------------------------------------------------------

113 -[Will merge to 'master' soon]

114 -

133 * dm/maint-docco (Thu Mar 19 20:35:34 2009 -0700) 6 commits

134 + Documentation: reword example text in git-bisect.txt.

135 + Documentation: reworded the "Description" section of git-

@@ -125,18 +143,60 @@ yet.

143 + test-lib.sh: Allow running the test suite against installed git

144 + test-lib.sh: Test for presence of git-init in the right path.

145

146 +* jc/attributes-checkout (Fri Mar 20 10:32:09 2009 +0100) 2 commits

147 + + Add a test for checking whether gitattributes is honored by

148 + checkout.

149 + + Read attributes from the index that is being checked out

150 +

151 +Original issue identified, and test provided by Kristian Amlie.

152 +

153 +* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits

154 + + Display warning for default git push with no push.default config

155 + + New config push.default to decide default behavior for push

156 +

157 +* mg/http-auth (Wed Mar 18 18:46:41 2009 -0500) 6 commits

158 + + http-push.c: use a faux remote to pass to http_init

159 + + Do not name "repo" struct "remote" in push_http.c

160 + + http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient

161 + versions of cURL

162 + + http authentication via prompts

163 + + http_init(): Fix config file parsing

164 + + http.c: style cleanups

165 +

166 +Amos King added push side support on top of my fetch side support.

167 +

168 +We may want to also pass --remote parameter from git-push to this backend

169 +as Daniel did as an interim solution for the fetch side, so that we can

170 +handle the configuration better.

171 +

172 +* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits

173 + + Move push matching and reporting logic into transport.c

174 + + Use a common function to get the pretty name of refs

175 +

176 ----------------------------------------------------------------

129 -[Discarded]

177 +[Will merge to 'master' soon]

178

131 -* hv/cvsimport-tests (Mon Mar 2 18:59:36 2009 +0100) 1 commit

132 - ? cvsimport: add test illustrating a bug in cvsps

179 +* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit

180 + + stat_tracking_info(): only count real commits

181

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

135 - ? Add a test of "git cvsimport"'s handling of tags and branches

136 - ? Add some tests of git-cvsimport's handling of vendor branches

137 - ? Test contents of entire cvsimported "master" tree contents

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

139 - ? Start a library for cvsimport-related tests

182 +This gives the merge commits zero weight when talking about how many

183 +commits you have ahead (or behind) of the branch you are tracking. Even

184 +though I agree that they should carry much less weight than the "real"

185 +commits, because your repeated merge from the other branch does not really

186 +add any real value to the end result, giving them absolute zero weight

187 +somehow feels wrong. At least it shows that your have been _active_ on the

188 +branch. But I do not feel very strongly about it.

189 +

190 +* jc/maint-1.6.0-keep-pack (Sat Mar 21 17:26:11 2009 -0500) 6 commits

191 + + pack-objects: don't loosen objects available in alternate or kept

192 + packs

193 + + t7700: demonstrate repack flaw which may loosen objects

194 + unnecessarily

195 + + Remove --kept-pack-only option and associated infrastructure

196 + + pack-objects: only repack or loosen objects residing in "local"

197 + packs

198 + + git-repack.sh: don't use --kept-pack-only option to pack-objects

199 + + t7700-repack: add two new tests demonstrating repacking flaws

200

201 ----------------------------------------------------------------

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

@@ -184,8 +244,6 @@ in binary mode as well.

244 - Add specification of git-vcs helpers

245 - Add "vcs" config option in remotes

246

187 -Daniel seems to have a plan for going forward with this series.

188 -

247 * cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits

248 - builtin-replace: use "usage_msg_opt" to give better error messages

249 - parse-options: add new function "usage_msg_opt"

@@ -219,54 +277,32 @@ haven't managed to.

277 - Add a script to edit/inspect notes

278 - Introduce commit notes

279

222 -----------------------------------------------------------------

223 -[Actively cooking]

224 -

225 -* jc/attributes-checkout (Fri Mar 20 10:32:09 2009 +0100) 2 commits

226 - - Add a test for checking whether gitattributes is honored by

227 - checkout.

228 - - Read attributes from the index that is being checked out

229 -

230 -Original issue identified, and test provided by Kristian Amlie.

231 -

232 -* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits

233 - - Display warning for default git push with no push.default config

234 - + New config push.default to decide default behavior for push

235 -

236 -Replaced the old series with the first step to allow a smooth transition.

237 -Some might argue that this should not give any warning but just give users

238 -this new configuration to play with first, and after we know we are going

239 -to switch default some day, start the warning.

240 -

241 -* mg/http-auth (Wed Mar 18 18:46:41 2009 -0500) 6 commits

242 - + http-push.c: use a faux remote to pass to http_init

243 - + Do not name "repo" struct "remote" in push_http.c

244 - + http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient

245 - versions of cURL

246 - + http authentication via prompts

247 - + http_init(): Fix config file parsing

248 - + http.c: style cleanups

249 -

250 -Amos King added push side support on top of my fetch side support.

280 +* hv/cvsps-tests (Wed Mar 18 18:33:41 2009 +0100) 7 commits

281 + - cvsimport: extend testcase about patchset order to contain

282 + branches

283 + - cvsimport: add test illustrating a bug in cvsps

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

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

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

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

288 + - Start a library for cvsimport-related tests

289

252 -We may want to also pass --remote parameter from git-push to this backend

253 -as Daniel did as an interim solution for the fetch side, so that we can

254 -handle the configuration better.

290 +Two cvsimport test topics were rewound from 'next' and merged into this

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

292 +to resolve issues these tests identify.

293

256 -* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits

257 - + Move push matching and reporting logic into transport.c

258 - + Use a common function to get the pretty name of refs

294 +----------------------------------------------------------------

295 +[Actively cooking]

296

260 -* kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit

261 - + stat_tracking_info(): only count real commits

297 +* da/difftool (Tue Mar 24 23:29:59 2009 -0700) 5 commits

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

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

300 + - difftool: add various git-difftool tests

301 + - difftool: add git-difftool to the list of commands

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

303

263 -This gives the merge commits zero weight when talking about how many

264 -commits you have ahead (or behind) of the branch you are tracking. Even

265 -though I agree that they should carry much less weight than the "real"

266 -commits, because your repeated merge from the other branch does not really

267 -add any real value to the end result, giving them absolute zero weight

268 -somehow feels wrong. At least it shows that your have been _active_ on the

269 -branch. But I do not feel very strongly about it.

304 +David has further refactoring which was a bit too early for me to pick

305 +up.

306

307 ----------------------------------------------------------------

308 [On Hold]

What's cooking (2009/03 #07)