87942e3f49 · matheusbsbs/matheus-bagliano

@@ -0,0 +1,315 @@

1 +To: git@vger.kernel.org

2 +Subject: What's cooking in git.git (Apr 2009, #01; Mon, 06)

3 +X-master-at: fbdc05661d9b732d06c47ccb3d5836d0d1b563e5

4 +X-next-at: 5efaefce91ae81a7490893cc6245a3f52998b522

5 +

6 +What's cooking in git.git (Apr 2009, #01; Mon, 06)

7 +--------------------------------------------------

8 +

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

10 +only in 'pu' while commits prefixed with '+' are in 'next'. The ones

11 +marked with '.' do not appear in any of the branches, but I am still

12 +holding onto them.

13 +

14 +The topics list the commits in reverse chronological order. The topics

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

16 +

17 +----------------------------------------------------------------

18 +[New Topics]

19 +

20 +* mh/html-path (Sun Apr 5 04:15:16 2009 +0200) 1 commit

21 + + add --html-path to get the location of installed HTML docs

22 +

23 +* lt/reflog-expire (Mon Mar 30 21:34:14 2009 -0700) 2 commits

24 + + Speed up reflog pruning of unreachable commits

25 + + Clean up reflog unreachability pruning decision

26 +

27 +* bs/maint-1.6.0-tree-walk-prefix (Wed Apr 1 19:34:03 2009 -0700) 2 commits

28 + + match_tree_entry(): a pathspec only matches at directory

29 + boundaries

30 + + tree_entry_interesting: a pathspec only matches at directory

31 + boundary

32 +

33 +* ms/http-auth (Wed Apr 1 19:48:24 2009 +0300) 1 commit

34 + + Allow curl to rewind the read buffers

35 +

36 +* js/maint-submodule-checkout (Thu Apr 2 15:30:25 2009 +0200) 1 commit

37 + + Fix 'git checkout <submodule>' to update the index

38 +

39 +* cb/maint-merge-recursive-submodule-fix (Sun Apr 5 02:47:00 2009 +0200) 3 commits

40 + + simplify output of conflicting merge

41 + + update cache for conflicting submodule entries

42 + + add tests for merging with submodules

43 +

44 +* fg/remote-prune (Fri Apr 3 11:03:44 2009 +0200) 2 commits

45 + + git remote update: New option --prune

46 + + builtin-remote.c: Split out prune_remote as a separate function.

47 +

48 +These should go to 'master' soonish.

49 +

50 +* cc/sha1-bsearch (Mon Apr 6 00:48:49 2009 -0700) 3 commits

51 + - sha1-lookup: fix up the assertion message

52 + - patch-ids: use the new generic "sha1_pos" function to lookup sha1

53 + - sha1-lookup: add new "sha1_pos" function to efficiently lookup

54 + sha1

55 +

56 +I think this is Ok for 'next', but somebody might want to prove me wrong

57 +by running some benchmarks.

58 +

59 +----------------------------------------------------------------

60 +[Will Discard]

61 +

62 +* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 1 commit

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

64 +

65 +----------------------------------------------------------------

66 +[Graduated to "master"]

67 +

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

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

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

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

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

73 + [blocktext]

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

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

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

77 + no-roff

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

79 + {1.72,normal}.xsl

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

81 + + Documentation/Makefile: break up texi pipeline

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

83 +

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

85 + + Documentation/Makefile: break up texi pipeline

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

87 +

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

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

90 + branch

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

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

93 + shorthand

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

95 + + Rename interpret/substitute nth_last_branch functions

96 +

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

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

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

100 + exclusive

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

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

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

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

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

106 +

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

108 + + Make local branches behave like remote branches when --tracked

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

110 +

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

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

113 + should look like

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

115 + codepath

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

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

118 +

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

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

121 +

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

123 + + format-patch: add arbitrary email headers

124 +

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

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

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

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

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

130 +

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

132 + + stat_tracking_info(): only count real commits

133 +

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

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

136 + packs

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

138 + unnecessarily

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

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

141 + packs

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

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

144 +

145 +----------------------------------------------------------------

146 +[Stalled and may need help and prodding to go forward]

147 +

148 +* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit

149 + - blame.c: start libifying the blame infrastructure

150 +

151 +A few minor point remains in this initial one. I hate to do these minor

152 +fix-ups myself, but I may end up doing so...

153 +

154 +* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit

155 + - Allow --date=local --date=other-format to work as expected

156 +

157 +The one I posted had a few corner-case bugs that was caught with the test

158 +suite; this one has them fixed. People did not like the UI so it is kept

159 +out of 'next'

160 +

161 +* lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit

162 + - archive.c: add support for --submodules[=(all|checkedout)]

163 +

164 +Discussion stalled on the submodule selection criteria.

165 +Probably I should discard it and wait for a reroll if needed.

166 +

167 +* jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit

168 + - git-merge-file: allow converting the results for the work tree

169 +

170 +This is a feature waiting for a user.

171 +

172 +We did not give scripted Porcelains a way to say "this temporary file I am

173 +using for merging is for this path, so use the core.autocrlf and attributes

174 +rules for that final path". Instead, merge-file simply wrote out the

175 +data in the canonical repository representation.

176 +

177 +rerere has the same issue, but it is a lot worse. It reads the three

178 +files (preimage, postimage and thisimage) from the work tree in the work

179 +tree representation, merges them without converting them to the canonical

180 +representation first but inserts the conflict markers with the canonical

181 +representation and writes the resulting mess out. It needs to be fixed to

182 +read with convert_to_git(), merge them while they are still in the

183 +canonical representation and possibly add conflict markers, and then write

184 +the results out after convert_to_working_tree(). It also needs to write

185 +in binary mode as well.

186 +

187 +* db/foreign-scm (Sun Jan 11 15:12:10 2009 -0500) 3 commits

188 + - Support fetching from foreign VCSes

189 + - Add specification of git-vcs helpers

190 + - Add "vcs" config option in remotes

191 +

192 +* js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits

193 + - tests: fix "export var=val"

194 + - notes: refuse to edit notes outside refs/notes/

195 + - t3301: use test_must_fail instead of !

196 + - t3301: fix confusing quoting in test for valid notes ref

197 + - notes: use GIT_EDITOR and core.editor over VISUAL/EDITOR

198 + - notes: only clean up message file when editing

199 + - handle empty notes gracefully

200 + - git notes show: test empty notes

201 + - git-notes: fix printing of multi-line notes

202 + - notes: fix core.notesRef documentation

203 + - Add an expensive test for git-notes

204 + - Speed up git notes lookup

205 + - Add a script to edit/inspect notes

206 + - Introduce commit notes

207 +

208 +* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits

209 + - t/t9600: remove exit after test_done

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

211 + branches

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

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

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

215 + + Test contents of entire cvsimported "master" tree contents

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

217 + + Start a library for cvsimport-related tests

218 +

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

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

221 +to resolve issues these tests identify.

222 +

223 +----------------------------------------------------------------

224 +[Actively cooking]

225 +

226 +* da/difftool (Sat Apr 4 21:00:24 2009 -0700) 25 commits

227 + - mergetool--lib: add new merge tool TortoiseMerge

228 + - mergetool--lib: make (g)vimdiff workable under Windows

229 + - mergetool--lib: consolidate the last redundant bits in

230 + {diff,merge}tool

231 + - mergetool-lib: specialize opendiff options when in diff mode

232 + - mergetool-lib: refactor run_mergetool and check_unchanged

233 + - bash completion: add git-difftool

234 + - {diff,merge}tool: rename helpers to remove them from tab-

235 + completion

236 + - mergetool-lib: add diffuse as merge and diff tool

237 + - mergetool-lib: specialize xxdiff options when in diff mode

238 + - mergetool-lib: specialize kdiff3 options when in diff mode

239 + - mergetool: use run_mergetool from git-mergetool-lib

240 + - difftool: use run_mergetool from git-mergetool-lib

241 + - mergetool-lib: introduce run_mergetool

242 + - difftool: use valid_tool from git-mergetool-lib

243 + - mergetool: use valid_tool from git-mergetool-lib

244 + - difftool: use get_mergetool_path from git-mergetool-lib

245 + - mergetool: use get_mergetool_path from git-mergetool-lib

246 + - Add a mergetool-lib scriptlet for holding common merge tool

247 + functions

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

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

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

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

252 + - difftool: add various git-difftool tests

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

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

255 +

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

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

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

259 + - t6030: test bisecting with paths

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

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

262 + "$GIT_DIR/BISECT_NAMES"

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

264 + - bisect: use the new generic "sha1_pos" function to lookup sha1

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

266 + - Merge branch 'cc/sha1-bsearch' into HEAD

267 + - patch-ids: use the new generic "sha1_pos" function to lookup sha1

268 + - sha1-lookup: add new "sha1_pos" function to efficiently lookup

269 + sha1

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

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

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

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

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

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

276 + functions

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

278 + array

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

280 + string

281 +

282 +Re-rolled and made earlier parts ready for 'master'. I think we should

283 +move this to 'next' soonish and aim to have it in 1.6.3

284 +

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

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

287 + - parse-options: add new function "usage_msg_opt"

288 + - builtin-replace: teach "git replace" to actually replace

289 + - Add new "git replace" command

290 + - environment: add global variable to disable replacement

291 + - mktag: call "check_sha1_signature" with the replacement sha1

292 + - replace_object: add a test case

293 + - object: call "check_sha1_signature" with the replacement sha1

294 + - sha1_file: add a "read_sha1_file_repl" function

295 + - replace_object: add mechanism to replace objects found in

296 + "refs/replace/"

297 + - refs: add a "for_each_replace_ref" function

298 + - patch-ids: use the new generic "sha1_pos" function to lookup sha1

299 + - sha1-lookup: add new "sha1_pos" function to efficiently lookup

300 + sha1

301 +

302 +Re-rolled based on the updated binary search API.

303 +

304 +----------------------------------------------------------------

305 +[On Hold]

306 +

307 +* jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit

308 + - receive-pack: default receive.denyDeleteCurrent to refuse

309 +

310 +* jc/refuse-push-to-current-1.7.0 (Wed Feb 11 02:28:03 2009 -0800) 1 commit

311 + - Refuse updating the current branch in a non-bare repository via

312 + push

313 +

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

315 +to be rethought.