4718b3f0a0 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jan 2010, #04; Wed, 13)

3 -X-master-at: 1f73566af5bec28cd8489c6139a9ede95817349c

4 -X-next-at: 20f8f4b285926bc486429e4b6b1d6fcf8a74804d

2 +Subject: What's cooking in git.git (Jan 2010, #05; Sat, 16)

3 +X-master-at: 561197238ef95b126b5ff16780250d492ad24233

4 +X-next-at: f77bc8fa3d46eb76daac398c969137b207334af2

5

6 -What's cooking in git.git (Jan 2010, #04; Wed, 13)

6 +What's cooking in git.git (Jan 2010, #05; Sat, 16)

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

8

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

@@ -11,165 +11,44 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones

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

12 still holding onto them.

13

14 ---------------------------------------------------

15 -[Graduated to "master"]

16 -

17 -* nd/sparse (2010-01-04) 25 commits

18 - (merged to 'next' on 2010-01-10 at fa73d6e)

19 - + t7002: test for not using external grep on skip-worktree paths

20 - + t7002: set test prerequisite "external-grep" if supported

21 - (merged to 'next' on 2010-01-02 at 5499bbe)

22 - + grep: do not do external grep on skip-worktree entries

23 - + commit: correctly respect skip-worktree bit

24 - + ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID

25 - + tests: rename duplicate t1009

26 - + sparse checkout: inhibit empty worktree

27 - + Add tests for sparse checkout

28 - + read-tree: add --no-sparse-checkout to disable sparse checkout support

29 - + unpack-trees(): ignore worktree check outside checkout area

30 - + unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index

31 - + unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout

32 - + unpack-trees.c: generalize verify_* functions

33 - + unpack-trees(): add CE_WT_REMOVE to remove on worktree alone

34 - + Introduce "sparse checkout"

35 - + dir.c: export excluded_1() and add_excludes_from_file_1()

36 - + excluded_1(): support exclude files in index

37 - + unpack-trees(): carry skip-worktree bit over in merged_entry()

38 - + Read .gitignore from index if it is skip-worktree

39 - + Avoid writing to buffer in add_excludes_from_file_1()

40 - + Teach Git to respect skip-worktree bit (writing part)

41 - + Teach Git to respect skip-worktree bit (reading part)

42 - + Introduce "skip-worktree" bit in index, teach Git to get/set this bit

43 - + Add test-index-version

44 - + update-index: refactor mark_valid() in preparation for new options

45 -

46 -With the removal of external grep near future, some codepaths will be

47 -slightly simplified.

48 -

49 -* cc/reset-more (2010-01-08) 8 commits

50 - (merged to 'next' on 2010-01-10 at 84730de)

51 - + t7111: check that reset options work as described in the tables

52 - (merged to 'next' on 2010-01-06 at 96639cb)

53 - + Documentation: reset: add some missing tables

54 - (merged to 'next' on 2010-01-04 at 8802c2c)

55 - + Fix bit assignment for CE_CONFLICTED

56 - (merged to 'next' on 2010-01-03 at f83d4c6)

57 - + "reset --merge": fix unmerged case

58 - + reset: use "unpack_trees()" directly instead of "git read-tree"

59 - + reset: add a few tests for "git reset --merge"

60 - + Documentation: reset: add some tables to describe the different options

61 - + reset: improve mixed reset error message when in a bare repo

62 -

63 -* rs/maint-archive-match-pathspec (2009-12-12) 1 commit

64 - (merged to 'next' on 2010-01-03 at 92d7d15)

65 - + archive: complain about path specs that don't match anything

66 -

67 -* il/vcs-helper (2010-01-09) 9 commits

68 - (merged to 'next' on 2010-01-10 at 11e448e)

69 - + Reset possible helper before reusing remote structure

70 - (merged to 'next' on 2010-01-06 at 7c79f42)

71 - + Remove special casing of http, https and ftp

72 - + Support remote archive from all smart transports

73 - + Support remote helpers implementing smart transports

74 - + Support taking over transports

75 - + Refactor git transport options parsing

76 - + Pass unknown protocols to external protocol handlers

77 - + Support mandatory capabilities

78 - + Add remote helper debug mode

79 -

80 -* jc/checkout-merge-base (2010-01-07) 4 commits

81 - (merged to 'next' on 2010-01-07 at 5229608)

82 - + rebase -i: teach --onto A...B syntax

83 - + rebase: fix --onto A...B parsing and add tests

84 - (merged to 'next' on 2010-01-02 at 6a8f6fc)

85 - + "rebase --onto A...B" replays history on the merge base between A and B

86 - + "checkout A...B" switches to the merge base between A and B

87 -

14 --------------------------------------------------

15 [New Topics]

16

91 -* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit

92 - (merged to 'next' on 2010-01-13 at 20f8f4b)

93 - + grep: optimize built-in grep by skipping lines that do not hit

94 - (this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.)

95 -

96 -Optimize the "line-by-line" internal grep by skiping en masse over lines

97 -that cannot possibly match.

98 -

99 -* jc/maint-grep-lookahead (2010-01-12) 0 commits

100 - (this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.)

101 -

102 -Early conflict resolution for the above for recent git.

103 -

104 -* jc/grep-lookahead (2010-01-12) 2 commits

105 - (merged to 'next' on 2010-01-13 at 20f8f4b)

106 - + grep: rip out pessimization to use fixmatch()

107 - + grep: rip out support for external grep

108 - (this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.)

109 -

110 -This is for eventual inclusion for the next release.

111 -

112 -* jc/symbol-static (2010-01-11) 17 commits

113 - - symlinks.c: remove unused functions

114 - - object.c: remove unused functions

115 - - blob.c: remove unused function

116 - - strbuf.c: remove unused function

117 - - sha1_file.c: remove unused function

118 - - mailmap.c: remove unused function

119 - - utf8.c: mark file-local function static

120 - - submodule.c: mark file-local function static

121 - - quote.c: mark file-local function static

122 - - remote-curl.c: mark file-local function static

123 - - read-cache.c: mark file-local functions static

124 - - parse-options.c: mark file-local function static

125 - - entry.c: mark file-local function static

126 - - http.c: mark file-local functions static

127 - - pretty.c: mark file-local function static

128 - - builtin-rev-list.c: mark file-local function static

129 - - bisect.c: mark file-local function static

130 -

131 -Mark file-local symbols "static", and remove unused functions. Daniel

132 -suggests to leave some comment for blob.c and I agree in principle, but

133 -I don't think of a good description myself.

134 -

135 -* nd/include-termios-for-osol (2010-01-11) 1 commit

136 - - Add missing #include to support TIOCGWINSZ on Solaris

137 -

138 -* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit

139 - - Remove empty directories when checking out a commit with fewer submodules

140 -

141 -Instead of using unlink(2) that will never succeed, use rmdir(2) to remove

142 -an empty directory, knowing that this won't harm a populated directory.

143 -

144 -* sd/cd-p-show-toplevel (2010-01-12) 2 commits

145 - - Use $(git rev-parse --show-toplevel) in cd_to_toplevel().

146 - - Add 'git rev-parse --show-toplevel' option.

147 -

148 -Avoid having to use "cd -P" that may not be available on some platforms'

149 -shells.

150 -

151 -* jk/warn-author-committer-after-commit (2010-01-13) 4 commits

152 - - commit: allow suppression of implicit identity advice

153 - - commit: show interesting ident information in summary

154 - - strbuf: add strbuf_addbuf_percentquote

155 - - strbuf_expand: convert "%%" to "%"

156 -

157 -* js/refer-upstream (2009-09-10) 1 commit

158 - - Introduce <branch>@{upstream} notation

159 -

160 -This does not teach the public interface about the new syntax; callers

161 -that care about distinction between name vs SHA-1 might not work as well

162 -as they should.

163 -

164 -* mm/conflict-advice (2010-01-12) 1 commit

165 - - Be more user-friendly when refusing to do something because of conflict.

166 -

167 -* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit

168 - - strbuf_addbuf(): allow passing the same buf to dst and src

169 -

170 -* jl/submodule-diff (2010-01-13) 2 commits

171 - - Teach diff that modified submodule directory is dirty

172 - - Show submodules as modified when they contain a dirty work tree

17 +* dp/maint-1.6.5-fast-import-non-commit-tag (2010-01-14) 1 commit

18 + (merged to 'next' on 2010-01-16 at f95ea8e)

19 + + fast-import: tag may point to any object type

20 +

21 +* il/push-set-upstream (2010-01-16) 1 commit

22 + (merged to 'next' on 2010-01-16 at e3a7a60)

23 + + Add push --set-upstream

24 +

25 +* js/windows (2010-01-15) 7 commits

26 + - Do not use date.c:tm_to_time_t() from compat/mingw.c

27 + - MSVC: Windows-native implementation for subset of Pthreads API

28 + - MSVC: Fix an "incompatible pointer types" compiler warning

29 + - Windows: avoid the "dup dance" when spawning a child process

30 + - Windows: simplify the pipe(2) implementation

31 + - Windows: boost startup by avoiding a static dependency on shell32.dll

32 + - Windows: disable Python

33 +

34 +* nd/status-partial-refresh (2010-01-14) 1 commit

35 + (merged to 'next' on 2010-01-16 at f77bc8f)

36 + + status: only touch path we may need to check

37 +

38 +* rr/core-tutorial (2010-01-16) 1 commit

39 + (merged to 'next' on 2010-01-16 at d9dd8bd)

40 + + Documentation: Update git core tutorial clarifying reference to scripts

41 +

42 +* jc/conflict-mark-len-attr (2010-01-16) 3 commits

43 + . WIP : honor conflict-marker-lenght in rerere (does not work yet)

44 + . rerere: use ll_merge() instead of using xdl_merge()

45 + . conflict-marker-length: new attribute

46 + (this branch uses jc/cache-unmerge.)

47 +

48 +I am attempting to introduce a new per-path attribute to specify

49 +non-default conflict marker length to help rerere grok conflicts in

50 +Documentation/git-merge.txt, but the series is not yet in a presentable

51 +state yet.

52

53 --------------------------------------------------

54 [Stalled]

@@ -185,25 +64,12 @@ as they should.

64 "git pull" patch needs sq-then-eval fix to protect it from $IFS

65 but otherwise seemed good.

66

188 -* mh/rebase-fixup (2010-01-12) 5 commits

189 - (merged to 'next' on 2010-01-12 at e84eab0)

190 - + rebase-i: Ignore comments and blank lines in peek_next_command

191 - + lib-rebase: Allow comments and blank lines to be added to the rebase script

192 - + lib-rebase: Provide clearer debugging info about what the editor did

193 - (merged to 'next' on 2010-01-06 at c4779a7)

194 - + Add a command "fixup" to rebase --interactive

195 - + t3404: Use test_commit to set up test repository

196 - (this branch is used by ns/rebase-auto-squash.)

197 -

198 -Expecting further improvements to skip opening the editor if a pick is

199 -followed only by "fixup" and no "squash".

200 -

201 -* ns/rebase-auto-squash (2009-12-08) 1 commit

202 - (merged to 'next' on 2010-01-06 at da4e2f5)

203 - + rebase -i --autosquash: auto-squash commits

204 - (this branch uses mh/rebase-fixup.)

67 +* js/refer-upstream (2009-09-10) 1 commit

68 + - Introduce <branch>@{upstream} notation

69

206 -Blocked by the above.

70 +This does not teach the public interface about the new syntax; callers

71 +that care about distinction between name vs SHA-1 might not work as well

72 +as they should.

73

74 * jh/notes (2009-12-07) 11 commits

75 - Refactor notes concatenation into a flexible interface for combining notes

@@ -228,19 +94,82 @@ file complaints before I do so if people have objections.

94

95 Hold: JH on 2010-01-05, http://article.gmane.org/gmane.comp.version-control.git/136183

96

231 -* jh/gitweb-cached (2010-01-13) 7 commits

232 - - (sign-off?) gitweb: File based caching layer (from git.kernel.org)

233 - - (sign-off?) gitweb: add a get function to compliment print_local_time

234 - - (sign-off?) gitweb: Convert output to using indirect file handle

235 - - gitweb: Optionally add "git" links in project list page

236 - - gitweb: Makefile improvements

237 - - gitweb: Add option to force version match

238 - - gitweb: Load checking

97 +--------------------------------------------------

98 +[Will merge to 'master' soon unless somebody complains]

99

240 -Replaced with a re-roll. Update to t9500 is probably needed.

100 +* jk/warn-author-committer-after-commit (2010-01-13) 4 commits

101 + (merged to 'next' on 2010-01-16 at f22c077)

102 + + commit: allow suppression of implicit identity advice

103 + + commit: show interesting ident information in summary

104 + + strbuf: add strbuf_addbuf_percentquote

105 + + strbuf_expand: convert "%%" to "%"

106

242 ---------------------------------------------------

243 -[Cooking]

107 +* tr/http-push-ref-status (2010-01-08) 6 commits

108 + (merged to 'next' on 2010-01-16 at 7e872ac)

109 + + transport-helper.c::push_refs(): emit "no refs" error message

110 + + transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed

111 + + transport.c::transport_push(): make ref status affect return value

112 + + refactor ref status logic for pushing

113 + + t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs

114 + + t5541-http-push.sh: add tests for non-fast-forward pushes

115 +

116 +* sr/gfi-options (2009-12-04) 7 commits

117 + (merged to 'next' on 2010-01-10 at 8b305fb)

118 + + fast-import: add (non-)relative-marks feature

119 + + fast-import: allow for multiple --import-marks= arguments

120 + + fast-import: test the new option command

121 + + fast-import: add option command

122 + + fast-import: add feature command

123 + + fast-import: put marks reading in its own function

124 + + fast-import: put option parsing code in separate functions

125 +

126 +* tc/smart-http-restrict (2010-01-14) 5 commits

127 + (merged to 'next' on 2010-01-16 at 71fc84c)

128 + + Test t5560: Fix test when run with dash

129 + (merged to 'next' on 2010-01-06 at 82736cb)

130 + + Smart-http tests: Test http-backend without curl or a webserver

131 + + Smart-http tests: Break test t5560-http-backend into pieces

132 + + Smart-http tests: Improve coverage in test t5560

133 + + Smart-http: check if repository is OK to export before serving it

134 +

135 +* tc/clone-v-progress (2009-12-26) 4 commits

136 + (merged to 'next' on 2010-01-10 at ec2bfd7)

137 + + clone: use --progress to force progress reporting

138 + + clone: set transport->verbose when -v/--verbose is used

139 + + git-clone.txt: reword description of progress behaviour

140 + + check stderr with isatty() instead of stdout when deciding to show progress

141 +

142 +Perhaps needs an entry in the Release Notes, but otherwise looked Ok.

143 +

144 +* jk/run-command-use-shell (2010-01-01) 8 commits

145 + (merged to 'next' on 2010-01-10 at 7479e2a)

146 + + t4030, t4031: work around bogus MSYS bash path conversion

147 + + diff: run external diff helper with shell

148 + + textconv: use shell to run helper

149 + + editor: use run_command's shell feature

150 + + run-command: optimize out useless shell calls

151 + + run-command: convert simple callsites to use_shell

152 + + t0021: use $SHELL_PATH for the filter script

153 + + run-command: add "use shell" option

154 +

155 +Shuffled the commits in the topic, following J6t's suggestion in

156 +http://thread.gmane.org/gmane.comp.version-control.git/136128

157 +

158 +* jn/makefile (2010-01-06) 4 commits

159 + (merged to 'next' on 2010-01-10 at f5a5d42)

160 + + Makefile: consolidate .FORCE-* targets

161 + + Makefile: learn to generate listings for targets requiring special flags

162 + + Makefile: use target-specific variable to pass flags to cc

163 + + Makefile: regenerate assembler listings when asked

164 +

165 +* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit

166 + (merged to 'next' on 2010-01-10 at df14116)

167 + + checkout -m path: fix recreating conflicts

168 +

169 +* bk/fix-relative-gitdir-file (2010-01-08) 2 commits

170 + (merged to 'next' on 2010-01-16 at cc4ae57)

171 + + Handle relative paths in submodule .git files

172 + + Test update-index for a gitlink to a .git file

173

174 * jh/commit-status (2010-01-13) 2 commits

175 (merged to 'next' on 2010-01-13 at 0905d59)

@@ -252,42 +181,60 @@ tired of waiting for tests to materialize and doing it myself, as I want

181 to close merge window for 1.7.0-rc0 by the end of next week to have the

182 final release early next month.

183

255 -* bk/fix-relative-gitdir-file (2010-01-08) 2 commits

256 - - Handle relative paths in submodule .git files

257 - - Test update-index for a gitlink to a .git file

258 -

259 -* jc/ident (2010-01-08) 3 commits

260 - - ident.c: treat $EMAIL as giving user.email identity explicitly

261 - (merged to 'next' on 2010-01-10 at f1f9ded)

262 - + ident.c: check explicit identity for name and email separately

263 - + ident.c: remove unused variables

264 -

265 -Opinions on the topmost one?

184 +* sd/cd-p-show-toplevel (2010-01-12) 2 commits

185 + (merged to 'next' on 2010-01-16 at 57d6d31)

186 + + Use $(git rev-parse --show-toplevel) in cd_to_toplevel().

187 + + Add 'git rev-parse --show-toplevel' option.

188

267 -* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits

268 - - ls-files: fix overeager pathspec optimization

269 - - read_directory(): further split treat_path()

270 - - read_directory_recursive(): refactor handling of a single path into a separate function

271 - - t3001: test ls-files -o ignored/dir

189 +Avoid having to use "cd -P" that may not be available on some platforms'

190 +shells.

191

273 -* js/exec-error-report (2010-01-12) 4 commits

274 - - Improve error message when a transport helper was not found

275 - - start_command: detect execvp failures early

276 - - run-command: move wait_or_whine earlier

277 - - start_command: report child process setup errors to the parent's stderr

192 +* tc/test-locate-httpd (2010-01-02) 1 commit

193 + (merged to 'next' on 2010-01-06 at 9d913e5)

194 + + t/lib-http.sh: Restructure finding of default httpd location

195

279 -* jc/maint-1.6.1-checkout-m-custom-merge (2010-01-06) 1 commit

280 - (merged to 'next' on 2010-01-10 at df14116)

281 - + checkout -m path: fix recreating conflicts

196 +--------------------------------------------------

197 +[Will merge to 'master' after a bit more cooking in 'next']

198 +

199 +* mh/rebase-fixup (2010-01-14) 21 commits

200 + (merged to 'next' on 2010-01-16 at 7ccb228)

201 + + rebase -i: Retain user-edited commit messages after squash/fixup conflicts

202 + + t3404: Set up more of the test repo in the "setup" step

203 + + rebase -i: For fixup commands without squashes, do not start editor

204 + + rebase -i: Change function make_squash_message into update_squash_message

205 + + rebase -i: Extract function do_with_author

206 + + rebase -i: Handle the author script all in one place in do_next

207 + + rebase -i: Extract a function "commit_message"

208 + + rebase -i: Simplify commit counting for generated commit messages

209 + + rebase -i: Improve consistency of commit count in generated commit messages

210 + + t3404: Test the commit count in commit messages generated by "rebase -i"

211 + + rebase -i: Introduce a constant AMEND

212 + + rebase -i: Introduce a constant AUTHOR_SCRIPT

213 + + rebase -i: Document how temporary files are used

214 + + rebase -i: Use symbolic constant $MSG consistently

215 + + rebase -i: Use "test -n" instead of "test ! -z"

216 + + rebase -i: Inline expression

217 + + rebase -i: Remove dead code

218 + + rebase -i: Make the condition for an "if" more transparent

219 + (merged to 'next' on 2010-01-12 at e84eab0)

220 + + rebase-i: Ignore comments and blank lines in peek_next_command

221 + + lib-rebase: Allow comments and blank lines to be added to the rebase script

222 + + lib-rebase: Provide clearer debugging info about what the editor did

223 + + Add a command "fixup" to rebase --interactive

224 + + t3404: Use test_commit to set up test repository

225 + (this branch is used by ns/rebase-auto-squash.)

226

283 -* jn/makefile (2010-01-06) 4 commits

284 - (merged to 'next' on 2010-01-10 at f5a5d42)

285 - + Makefile: consolidate .FORCE-* targets

286 - + Makefile: learn to generate listings for targets requiring special flags

287 - + Makefile: use target-specific variable to pass flags to cc

288 - + Makefile: regenerate assembler listings when asked

227 +* ns/rebase-auto-squash (2009-12-08) 1 commit

228 + (merged to 'next' on 2010-01-06 at da4e2f5)

229 + + rebase -i --autosquash: auto-squash commits

230 + (this branch uses mh/rebase-fixup.)

231

290 -* da/difftool (2010-01-09) 6 commits

232 +* da/difftool (2010-01-15) 10 commits

233 + (merged to 'next' on 2010-01-16 at 609f0da)

234 + + difftool: Update copyright notices to list each year separately

235 + + difftool: Use eval to expand '--extcmd' expressions

236 + + difftool: Add '-x' and as an alias for '--extcmd'

237 + + t7800-difftool.sh: Simplify the --extcmd test

238 (merged to 'next' on 2010-01-10 at 749c870)

239 + git-diff.txt: Link to git-difftool

240 + difftool: Allow specifying unconfigured commands with --extcmd

@@ -297,9 +244,64 @@ Opinions on the topmost one?

244 + git-difftool: Add '--gui' for selecting a GUI tool

245 + t7800-difftool: Set a bogus tool for use by tests

246

300 -* tc/test-locate-httpd (2010-01-02) 1 commit

301 - (merged to 'next' on 2010-01-06 at 9d913e5)

302 - + t/lib-http.sh: Restructure finding of default httpd location

247 +* mm/conflict-advice (2010-01-12) 1 commit

248 + (merged to 'next' on 2010-01-16 at b83be11)

249 + + Be more user-friendly when refusing to do something because of conflict.

250 +

251 +* jc/maint-strbuf-add-fix-doubling (2010-01-12) 1 commit

252 + (merged to 'next' on 2010-01-16 at 5959eee)

253 + + strbuf_addbuf(): allow passing the same buf to dst and src

254 +

255 +* jc/maint-1.6.4-grep-lookahead (2010-01-10) 1 commit

256 + (merged to 'next' on 2010-01-13 at 20f8f4b)

257 + + grep: optimize built-in grep by skipping lines that do not hit

258 + (this branch is used by jc/grep-lookahead and jc/maint-grep-lookahead.)

259 +

260 +Optimize the "line-by-line" internal grep by skiping en masse over lines

261 +that cannot possibly match.

262 +

263 +* jc/maint-grep-lookahead (2010-01-12) 0 commits

264 + (this branch uses jc/maint-1.6.4-grep-lookahead; is used by jc/grep-lookahead.)

265 +

266 +Early conflict resolution for the above for recent git.

267 +

268 +* jc/grep-lookahead (2010-01-15) 4 commits

269 + - grep --no-index: allow use of "git grep" outside a git repository

270 + - grep: prepare to run outside of a work tree

271 + (merged to 'next' on 2010-01-13 at 20f8f4b)

272 + + grep: rip out pessimization to use fixmatch()

273 + + grep: rip out support for external grep

274 + (this branch uses jc/maint-1.6.4-grep-lookahead and jc/maint-grep-lookahead.)

275 +

276 +* nd/include-termios-for-osol (2010-01-11) 1 commit

277 + (merged to 'next' on 2010-01-16 at 3160c76)

278 + + Add missing #include to support TIOCGWINSZ on Solaris

279 +

280 +* pc/uninteresting-submodule-disappear-upon-switch-branches (2010-01-11) 1 commit

281 + (merged to 'next' on 2010-01-16 at b06ca1a)

282 + + Remove empty directories when checking out a commit with fewer submodules

283 +

284 +Instead of using unlink(2) that will never succeed, use rmdir(2) to remove

285 +an empty directory, knowing that this won't harm a populated directory.

286 +

287 +* jl/submodule-diff (2010-01-16) 2 commits

288 + (merged to 'next' on 2010-01-16 at 0a99e3c)

289 + + Teach diff that modified submodule directory is dirty

290 + + Show submodules as modified when they contain a dirty work tree

291 +

292 +* jc/ls-files-ignored-pathspec (2010-01-08) 4 commits

293 + (merged to 'next' on 2010-01-16 at d36016a)

294 + + ls-files: fix overeager pathspec optimization

295 + + read_directory(): further split treat_path()

296 + + read_directory_recursive(): refactor handling of a single path into a separate function

297 + + t3001: test ls-files -o ignored/dir

298 +

299 +* js/exec-error-report (2010-01-12) 4 commits

300 + (merged to 'next' on 2010-01-16 at 0e28d02)

301 + + Improve error message when a transport helper was not found

302 + + start_command: detect execvp failures early

303 + + run-command: move wait_or_whine earlier

304 + + start_command: report child process setup errors to the parent's stderr

305

306 * jc/fix-tree-walk (2009-09-14) 7 commits

307 (merged to 'next' on 2010-01-13 at 1c01b87)

@@ -315,44 +317,6 @@ Resurrected from "Ejected" category. This is fix for a tricky codepath

317 and testing and improving before it hits 'master' is greatly appreciated.

318 (I have been using this in my private build for some time).

319

318 -* jc/branch-d (2009-12-29) 1 commit

319 - (merged to 'next' on 2010-01-10 at 61a14b7)

320 - + branch -d: base the "already-merged" safety on the branch it merges with

321 -

322 -* jc/rerere (2009-12-04) 1 commit

323 - (merged to 'next' on 2010-01-10 at e295b7f)

324 - + Teach --[no-]rerere-autoupdate option to merge, revert and friends

325 -

326 -* jk/run-command-use-shell (2010-01-01) 8 commits

327 - (merged to 'next' on 2010-01-10 at 7479e2a)

328 - + t4030, t4031: work around bogus MSYS bash path conversion

329 - + diff: run external diff helper with shell

330 - + textconv: use shell to run helper

331 - + editor: use run_command's shell feature

332 - + run-command: optimize out useless shell calls

333 - + run-command: convert simple callsites to use_shell

334 - + t0021: use $SHELL_PATH for the filter script

335 - + run-command: add "use shell" option

336 -

337 -Shuffled the commits in the topic, following J6t's suggestion in

338 -http://thread.gmane.org/gmane.comp.version-control.git/136128

339 -

340 -* tc/clone-v-progress (2009-12-26) 4 commits

341 - (merged to 'next' on 2010-01-10 at ec2bfd7)

342 - + clone: use --progress to force progress reporting

343 - + clone: set transport->verbose when -v/--verbose is used

344 - + git-clone.txt: reword description of progress behaviour

345 - + check stderr with isatty() instead of stdout when deciding to show progress

346 -

347 -Perhaps needs an entry in the Release Notes, but otherwise looked Ok.

348 -

349 -* tc/smart-http-restrict (2010-01-02) 4 commits

350 - (merged to 'next' on 2010-01-06 at 82736cb)

351 - + Smart-http tests: Test http-backend without curl or a webserver

352 - + Smart-http tests: Break test t5560-http-backend into pieces

353 - + Smart-http tests: Improve coverage in test t5560

354 - + Smart-http: check if repository is OK to export before serving it

355 -

320 * jc/cache-unmerge (2009-12-25) 9 commits

321 (merged to 'next' on 2010-01-13 at 2290c44)

322 + rerere forget path: forget recorded resolution

@@ -364,23 +328,60 @@ Perhaps needs an entry in the Release Notes, but otherwise looked Ok.

328 + resolve-undo: basic tests

329 + resolve-undo: record resolved conflicts in a new index extension section

330 + builtin-merge.c: use standard active_cache macros

331 + (this branch is used by jc/conflict-mark-len-attr.)

332

368 -* tr/http-push-ref-status (2010-01-08) 6 commits

369 - - transport-helper.c::push_refs(): emit "no refs" error message

370 - - transport-helper.c::push_refs(): ignore helper-reported status if ref is not to be pushed

371 - - transport.c::transport_push(): make ref status affect return value

372 - - refactor ref status logic for pushing

373 - - t5541-http-push.sh: add test for unmatched, non-fast-forwarded refs

374 - - t5541-http-push.sh: add tests for non-fast-forward pushes

333 +* jc/rerere (2009-12-04) 1 commit

334 + (merged to 'next' on 2010-01-10 at e295b7f)

335 + + Teach --[no-]rerere-autoupdate option to merge, revert and friends

336

376 -Rerolled.

337 +--------------------------------------------------

338 +[Cooking]

339 +

340 +* jc/symbol-static (2010-01-11) 17 commits

341 + - symlinks.c: remove unused functions

342 + - object.c: remove unused functions

343 + - blob.c: remove unused function

344 + - strbuf.c: remove unused function

345 + - sha1_file.c: remove unused function

346 + - mailmap.c: remove unused function

347 + - utf8.c: mark file-local function static

348 + - submodule.c: mark file-local function static

349 + - quote.c: mark file-local function static

350 + - remote-curl.c: mark file-local function static

351 + - read-cache.c: mark file-local functions static

352 + - parse-options.c: mark file-local function static

353 + - entry.c: mark file-local function static

354 + - http.c: mark file-local functions static

355 + - pretty.c: mark file-local function static

356 + - builtin-rev-list.c: mark file-local function static

357 + - bisect.c: mark file-local function static

358 +

359 +Mark file-local symbols "static", and remove unused functions. Daniel

360 +suggests to leave some comment for blob.c and I agree in principle, but

361 +I don't think of a good description myself.

362 +

363 +* jh/gitweb-cached (2010-01-13) 9 commits

364 + - gitweb: File based caching layer (from git.kernel.org)

365 + - gitweb: Convert output to using indirect file handle

366 + - gitweb: cleanup error message produced by undefined $site_header

367 + - gitweb: add a get function to compliment print_sort_th

368 + - gitweb: add a get function to compliment print_local_time

369 + - gitweb: Makefile improvements

370 + - gitweb: Add option to force version match

371 + - gitweb: change die_error to take "extra" argument for extended die information

372 + - gitweb: Load checking

373 +

374 +Replaced with a re-roll. Update to t9500 is probably needed.

375 +

376 +* jc/ident (2010-01-08) 3 commits

377 + - ident.c: treat $EMAIL as giving user.email identity explicitly

378 + (merged to 'next' on 2010-01-10 at f1f9ded)

379 + + ident.c: check explicit identity for name and email separately

380 + + ident.c: remove unused variables

381 +

382 +Opinions on the topmost one?

383 +

384 +* jc/branch-d (2009-12-29) 1 commit

385 + (merged to 'next' on 2010-01-10 at 61a14b7)

386 + + branch -d: base the "already-merged" safety on the branch it merges with

387

378 -* sr/gfi-options (2009-12-04) 7 commits

379 - (merged to 'next' on 2010-01-10 at 8b305fb)

380 - + fast-import: add (non-)relative-marks feature

381 - + fast-import: allow for multiple --import-marks= arguments

382 - + fast-import: test the new option command

383 - + fast-import: add option command

384 - + fast-import: add feature command

385 - + fast-import: put marks reading in its own function

386 - + fast-import: put option parsing code in separate functions

What's cooking (2010/01 #05)