cc33c1ad78 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2010, #05; Tue, 25)

3 -X-master-at: d0b16c8f878bef5c1268e033a3d1f427498c7008

4 -X-next-at: b26ba11a604b521da594b71d7e3fbc51f26e24fa

2 +Subject: What's cooking in git.git (Jun 2010, #01; Wed, 2)

3 +X-master-at: bdc4204119d2847ea8f1ae5e44614be859951822

4 +X-next-at: c7bbdb20f017cfc4f70c5cad0067b0a3e6650153

5

6 -What's cooking in git.git (May 2010, #05; Tue, 25)

6 +What's cooking in git.git (Jun 2010, #01; Wed, 2)

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

8

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

@@ -20,232 +20,236 @@ development machine has been unpacked but I still haven't managed to get

20 back to speed yet.

21

22 --------------------------------------------------

23 -[Graduated to "master"]

24 -

25 -* ar/config-from-command-line (2010-03-26) 2 commits

26 - (merged to 'next' on 2010-05-04 at 2962717)

27 - + Use strbufs instead of open-coded string manipulation

28 - + Allow passing of configuration parameters in the command line

29 -

30 -* by/blame-doc-m-c (2010-05-06) 1 commit

31 - (merged to 'next' on 2010-05-09 at c975ad5)

32 - + blame-options.txt: Add default value for `-M/-C` options.

33 -

34 -* by/log-follow (2010-05-10) 4 commits

35 - (merged to 'next' on 2010-05-10 at f4ce9f8)

36 - + tests: rename duplicate t4205

37 - (merged to 'next' on 2010-05-09 at d97e924)

38 - + Make git log --follow find copies among unmodified files.

39 - + Make diffcore_std only can run once before a diff_flush

40 - + Add a macro DIFF_QUEUE_CLEAR.

41 -

42 -* cb/maint-stash-orphaned-file (2010-04-18) 2 commits

43 - (merged to 'next' on 2010-05-04 at 38488ba)

44 - + stash tests: stash can lose data in a file removed from the index

45 - + stash: Don't overwrite files that have gone from the index

46 -

47 -* cw/maint-exec-defpath (2010-04-15) 2 commits

48 - (merged to 'next' on 2010-05-04 at 8d1591f)

49 - + autoconf: Check if <paths.h> exists and set HAVE_PATHS_H

50 - + exec_cmd.c: replace hard-coded path list with one from <paths.h>

51 -

52 -* jc/am-3-show-corrupted-patch (2010-04-09) 1 commit

53 - (merged to 'next' on 2010-05-04 at 951f0e6)

54 - + am -3: recover the diagnostic messages for corrupt patches

55 -

56 -* jc/maint-no-reflog-expire-unreach-for-head (2010-04-09) 3 commits

57 - (merged to 'next' on 2010-05-04 at d23a180)

58 - + reflog --expire-unreachable: special case entries in "HEAD" reflog

59 - + more war on "sleep" in tests

60 - + Document gc.<pattern>.reflogexpire variables

61 -

62 -* jc/status-show-ignored (2010-05-01) 6 commits

63 - (merged to 'next' on 2010-05-04 at 8b32120)

64 - + wt-status: fix 'fprintf' compilation warning

65 - + status: --ignored option shows ignored files

66 - + wt-status: rename and restructure status-print-untracked

67 - + wt-status: collect ignored files

68 - + wt-status: plug memory leak while collecting untracked files

69 - + wt-status: remove unused workdir_untracked member

70 -

71 -I am negative about conflating the JSON output to the mix at this point.

72 -Let's stabilize "status" with the existing --porcelain/-z option first.

73 -

74 -* jn/fsck-ident (2010-04-24) 1 commit

75 - (merged to 'next' on 2010-05-09 at 0d36355)

76 - + fsck: check ident lines in commit objects

77 -

78 -There also was a companion patch to fast-import to deal with foreign SCM

79 -interface that may not have human-readable author identifier.

80 -

81 -* jn/gitweb-caching-prep (2010-04-24) 5 commits

82 - (merged to 'next' on 2010-05-09 at ceb4dad)

83 - + gitweb: Move generating page title to separate subroutine

84 - + gitweb: Add custom error handler using die_error

85 - + gitweb: Use nonlocal jump instead of 'exit' in die_error

86 - + gitweb: href(..., -path_info => 0|1)

87 - + Export more test-related variables when running external tests

88 - (this branch shares commits with jn/gitweb-fastcgi.)

89 -

90 -* jn/gitweb-install (2010-05-01) 2 commits

91 - (merged to 'next' on 2010-05-09 at 9ea6cad)

92 - + gitweb: Create install target for gitweb in Makefile

93 - + gitweb: Improve installation instructions in gitweb/INSTALL

94 -

95 -* jn/gitweb-our-squelch (2010-04-30) 1 commit

96 - (merged to 'next' on 2010-05-09 at 060726a)

97 - + gitweb: Silence 'Variable VAR may be unavailable' warnings

98 -

99 -* jn/maint-bundle (2010-04-19) 2 commits

100 - (merged to 'next' on 2010-05-04 at f2086f5)

101 - + fix "bundle --stdin" segfault

102 - + t5704 (bundle): add tests for bundle --stdin

103 -

104 -* jn/maint-request-pull (2010-05-07) 3 commits

105 - + t5150: protect backslash with backslash in shell

106 - + request-pull: protect against OPTIONS_KEEPDASHDASH from environment

107 - + tests for request-pull

108 - (this branch is used by jn/request-pull.)

109 -

110 -* jn/request-pull (2010-05-10) 3 commits

111 - (merged to 'next' on 2010-05-10 at fcae760)

112 - + tests: chmod +x t5150

113 - (merged to 'next' on 2010-05-09 at 05aadd6)

114 - + adapt request-pull tests for new pull request format

115 - + Merge branch 'jn/maint-request-pull' into jn/request-pull

116 - (this branch uses jn/maint-request-pull.)

117 -

118 -* jn/shortlog (2010-05-03) 5 commits

119 - (merged to 'next' on 2010-05-09 at efd1311)

120 - + pretty: Respect --abbrev option

121 - + shortlog: Document and test --format option

122 - + t4201 (shortlog): Test output format with multiple authors

123 - + t4201 (shortlog): guard setup with test_expect_success

124 - + Documentation/shortlog: scripted users should not rely on implicit HEAD

125 -

126 -* jn/submodule-basic-test (2010-04-10) 3 commits

127 - (merged to 'next' on 2010-05-04 at 0bec27a)

128 - + t7400: clarify submodule update tests

129 - + t7400: clarify 'submodule add' tests

130 - + t7400: split setup into multiple tests

131 -

132 -* jn/t7006-fixup (2010-04-14) 1 commit

133 - (merged to 'next' on 2010-05-04 at 490ab5d)

134 - + t7006: guard cleanup with test_expect_success

135 -

136 -* js/maint-receive-pack-symref-alias (2010-04-19) 3 commits

137 - (merged to 'next' on 2010-05-04 at 259f4f1)

138 - + t5516-fetch-push.sh: style cleanup

139 - + receive-pack: detect aliased updates which can occur with symrefs

140 - + receive-pack: switch global variable 'commands' to a parameter

141 -

142 -* mg/advice-statushints (2010-04-22) 2 commits

143 - (merged to 'next' on 2010-05-09 at 4642509)

144 - + wt-status: take advice.statusHints seriously

145 - + t7508: test advice.statusHints

146 -

147 -* np/index-pack-memsave (2010-04-12) 3 commits

148 - (merged to 'next' on 2010-05-04 at 366b014)

149 - + index-pack: smarter memory usage when appending objects

150 - + index-pack: rationalize unpack_entry_data()

151 - + index-pack: smarter memory usage when resolving deltas

152 -

153 -* np/malloc-threading (2010-04-08) 2 commits

154 - (merged to 'next' on 2010-05-04 at 1b0567f)

155 - + Thread-safe xmalloc and xrealloc needs a recursive mutex

156 - + Make xmalloc and xrealloc thread-safe

157 - (this branch is used by js/try-to-free-stackable.)

158 -

159 -This fix should eventually go to 'maint' and 'master'.

160 -

161 -* pb/patch-id-plus (2010-04-19) 2 commits

162 - (merged to 'next' on 2010-05-04 at 59881b8)

163 - + patch-id: Add support for mbox format

164 - + patch-id: extract parsing one diff out of generate_id_list

165 -

166 -* rr/doc-submitting (2010-04-19) 1 commit

167 - (merged to 'next' on 2010-05-04 at 5f040bd)

168 - + SubmittingPatches: Add new section about what to base work on

169 -

170 -* sp/maint-describe-tiebreak-with-tagger-date (2010-04-12) 5 commits

171 - (merged to 'next' on 2010-05-04 at af2d605)

172 - + describe: Break annotated tag ties by tagger date

173 - + tag.c: Parse tagger date (if present)

174 - + tag.c: Refactor parse_tag_buffer to be saner to program

175 - + tag.h: Remove unused signature field

176 - + tag.c: Correct indentation

177 -

178 -* sp/maint-dumb-http-pack-reidx (2010-04-19) 12 commits

179 - (merged to 'next' on 2010-05-04 at 166443a)

180 - + http.c::new_http_pack_request: do away with the temp variable filename

181 - + http-fetch: Use temporary files for pack-*.idx until verified

182 - + http-fetch: Use index-pack rather than verify-pack to check packs

183 - + Allow parse_pack_index on temporary files

184 - + Extract verify_pack_index for reuse from verify_pack

185 - + Introduce close_pack_index to permit replacement

186 - + http.c: Remove unnecessary strdup of sha1_to_hex result

187 - + http.c: Don't store destination name in request structures

188 - + http.c: Drop useless != NULL test in finish_http_pack_request

189 - + http.c: Tiny refactoring of finish_http_pack_request

190 - + t5550-http-fetch: Use subshell for repository operations

191 - + http.c: Remove bad free of static block

192 -

193 -* sr/remote-helper-export (2010-04-12) 9 commits

194 - (merged to 'next' on 2010-05-04 at 519ab16)

195 - + t5800: testgit helper requires Python support

196 - + Makefile: Simplify handling of python scripts

197 - + remote-helpers: add tests for testgit helper

198 - + remote-helpers: add testgit helper

199 - + remote-helpers: add support for an export command

200 - + remote-helpers: allow requesing the path to the .git directory

201 - + fast-import: always create marks_file directories

202 - + clone: also configure url for bare clones

203 - + clone: pass the remote name to remote_get

204 - (this branch is used by jp/hold-string-list-sanity.)

23 +[New Topics]

24 +

25 +* bs/userdiff-php (2010-05-23) 1 commit

26 + - diff: Support visibility modifiers in the PHP hunk header regexp

27 +

28 +Will merge to 'next'.

29 +

30 +* cc/maint-diff-CC-binary (2010-06-02) 2 commits

31 + - fixup

32 + - diff: fix "git show -C -C" output when renaming a binary file

33 +

34 +The fix-up should probably be squashed in, as the original "fix" was

35 +barking up a wrong tree.

36 +

37 +* jn/gitweb-plackup (2010-05-28) 3 commits

38 + - git-instaweb: Add support for running gitweb via 'plackup'

39 + - git-instaweb: Wait for server to start before running web browser

40 + - git-instaweb: Remove pidfile after stopping web server

41 + (this branch uses ps/gitweb-soc.)

42 +

43 +Will merge to 'next'.

44 +

45 +* mg/status-b (2010-05-25) 2 commits

46 + - Documentation+t5708: document and test status -s -b

47 + - Show branch information in short output of git status

48 +

49 +There are a few style violations that snuck in, but otherwise looked

50 +sensible.

51 +

52 +* ps/gitweb-soc (2010-05-28) 4 commits

53 + - git-instaweb: Configure it to work with new gitweb structure

54 + - git-instaweb: Put httpd logs in a "$httpd_only" subdirectory

55 + - gitweb: Set default destination directory for installing gitweb in Makefile

56 + - gitweb: Move static files into seperate subdirectory

57 + (this branch is used by jn/gitweb-plackup.)

58 +

59 +Will merge to 'next'.

60 +

61 +* tc/commit-abbrev-fix (2010-05-27) 3 commits

62 + - commit::print_summary(): set rev_info.always_show_header to 1

63 + - t7502-commit: add summary output tests for empty and merge commits

64 + - t7502-commit: add tests for summary output

65 +

66 +Will merge to 'next'. I am not quite happy about the "impossible to

67 +trigger" die message, though. It is a good defensive programming to catch

68 +breakages caused by future changes that may invalidate the assumption this

69 +patch makes, but then the message should be worded as such to state that

70 +assumption, I think.

71 +

72 +* ab/maint-perl-use-instlibdir (2010-05-30) 1 commit

73 + - Makefile: remove redundant munging of @@INSTLIBDIR@@

74 +

75 +Will merge to 'next'.

76 +

77 +* by/diff-graph (2010-05-29) 6 commits

78 + - Make --color-words work well with --graph

79 + - graph.c: register a callback for graph output

80 + - Emit a whole line in one go

81 + - diff.c: Output the text graph padding before each diff line

82 + - Output the graph columns at the end of the commit message

83 + - Add a prefix output callback to diff output

84 +

85 +Will merge to 'next'.

86 +

87 +* cc/cherry-pick-series (2010-06-02) 8 commits

88 + - Documentation/revert: describe passing more than one commit

89 + - Documentation/cherry-pick: describe passing more than one commit

90 + - revert: add tests to check cherry-picking many commits

91 + - revert: allow cherry-picking more than one commit

92 + - revert: change help_msg() to take no argument

93 + - revert: refactor code into a do_pick_commit() function

94 + - revert: use run_command_v_opt() instead of execv_git_cmd()

95 + - revert: cleanup code for -x option

96 +

97 +* gs/usage-to-stdout (2010-05-17) 1 commit

98 + - print the usage string on stdout instead of stderr

99 +

100 +Will merge to 'next'.

101 +

102 +* gv/portable (2010-05-14) 18 commits

103 + - Makefile: Tru64 portability fix

104 + - Makefile: HP-UX 10.20 portability fixes

105 + - Makefile: HPUX11 portability fixes

106 + - Makefile: SunOS 5.6 portability fix

107 + - inline declaration does not work on AIX

108 + - Allow disabling "inline"

109 + - Some platforms lack socklen_t type

110 + - Make NO_{INET_NTOP,INET_PTON} configured independently

111 + - Makefile: some platforms do not have hstrerror anywhere

112 + - git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition

113 + - test_cmp: do not use "diff -u" on platforms that lack one

114 + - fixup: do not unconditionally disable "diff -u"

115 + - tests: use "test_cmp", not "diff", when verifying the result

116 + - Do not use "diff" found on PATH while building and installing

117 + - enums: omit trailing comma for portability

118 + - Makefile: -lpthread may still be necessary when libc has only pthread stubs

119 + - Rewrite dynamic structure initializations to runtime assignment

120 + - Makefile: pass CPPFLAGS through to fllow customization

121 +

122 +Will merge to 'next'.

123 +

124 +* jh/diff-index-line-abbrev (2010-05-30) 1 commit

125 + - diff.c: Ensure "index $from..$to" line contains unambiguous SHA1s

126 +

127 +Will merge to 'next'.

128 +

129 +* jk/am-skip-hint (2010-05-30) 1 commit

130 + - git-am: suggest what to do with superfluous patches

131 +

132 +Will merge to 'next'.

133 +

134 +* jn/checkout-doc (2010-05-30) 1 commit

135 + - Documentation/checkout: clarify description

136 +

137 +Will merge to 'next'.

138 +

139 +* jn/fsck-ident (2010-05-26) 1 commit

140 + - fsck: fix bogus commit header check

141 +

142 +Will merge to 'next'.

143 +

144 +* jn/maint-doc-ignore (2010-03-05) 1 commit

145 + - gitignore.5: Clarify matching rules

146 +

147 +Will merge to 'next'.

148 +

149 +* jn/rebase-cmdline-fix (2010-05-31) 1 commit

150 + - rebase: improve error message when upstream argument is missing

151 +

152 +Will merge to 'next'.

153 +

154 +* ps/gitweb--browse-chrome (2010-05-30) 1 commit

155 + - git-web--browse: Add support for google chrome and chromium

156 +

157 +Will merge to 'next'.

158 +

159 +* bc/portable (2010-06-01) 5 commits

160 + - t/aggregate-results: accomodate systems with small max argument list length

161 + - t/t7006: ignore return status of shell's unset builtin

162 + - t/t5150: remove space from sed script

163 + - git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh

164 + - t/t5800: skip if python version is older than 2.5

165

206 -* st/remote-tags-no-tags (2010-04-20) 2 commits

207 - (merged to 'next' on 2010-05-09 at fa9e04e)

208 - + remote add: add a --[no-]tags option

209 - + Honor "tagopt = --tags" configuration option

166 +* jn/show-num-walks (2010-06-01) 1 commit

167 + - DWIM 'git show -5' to 'git show --do-walk -5'

168

211 -* tr/word-diff (2010-04-14) 1 commit

212 - (merged to 'next' on 2010-05-04 at d191b25)

213 - + diff: add --word-diff option that generalizes --color-words

169 +* rr/am-help (2010-06-02) 3 commits

170 + - git am: Remove stray error message from sed

171 + - git am: Display some help text when patch is empty

172 + - git am: Set cmdline globally

173

215 -There are gitk patches that go with this series.

174 +Will merge to 'next'.

175 +

176 +* jc/t9129-any-utf8 (2010-06-02) 1 commit

177 + - t9129: fix UTF-8 locale detection

178

179 --------------------------------------------------

218 -[New Topics]

180 +[Stalled -- would discard unless there are some movements soon]

181 +

182 +* jc/rev-list-ancestry-path (2010-04-20) 1 commit

183 + - revision: --ancestry-path

184 +

185 +Just an illustration patch. merge simplification logic used when

186 +pathspecs are in effect interacts with this rather badly.

187 +

188 +* js/rebase-origin-x (2010-02-05) 1 commit

189 + - [RFC w/o test and incomplete] rebase: add -x option to record original commit name

190 +

191 +I retract my objection against the idea of -x; needs polishing before

192 +moving forward.

193 +

194 +* js/grep-open (2010-05-01) 3 commits

195 + - grep: do not ignore return value from chdir()

196 + - grep -O: allow optional argument specifying the pager (or editor)

197 + - grep: Add the option '--open-files-in-pager'

198 + (this branch is used by jp/hold-string-list-sanity.)

199 +

200 +Probably needs to support --no-index mode as well.

201 +

202 +--------------------------------------------------

203 +[Cooking]

204

205 * em/checkout-orphan (2010-05-21) 5 commits

221 - - [sign-off?] bash completion: add --orphan to 'git checkout'

222 - - [sign-off?] t3200: test -l with core.logAllRefUpdates options

223 - - [sign-off?] checkout --orphan: respect -l option always

224 - - [sign-off?] refs: split log_ref_write logic into log_ref_setup

225 - - [sign-off?] Documentation: alter checkout --orphan description

206 + - bash completion: add --orphan to 'git checkout'

207 + - t3200: test -l with core.logAllRefUpdates options

208 + - checkout --orphan: respect -l option always

209 + - refs: split log_ref_write logic into log_ref_setup

210 + - Documentation: alter checkout --orphan description

211 +

212 +In <4BFE2461.5080501@drmicha.warpmail.net>, Michael J Gruber raised a

213 +valid request for a better explanation of superfluous files left behind

214 +and then are cleaned. Other than that I think this is a sane thing to

215 +do.

216

217 * ec/diff-noprefix-config (2010-05-02) 1 commit

218 - diff: add configuration option for disabling diff prefixes.

219

220 +Will merge to 'next'.

221 +

222 * jk/diff-m-doc (2010-05-08) 1 commit

223 - docs: clarify meaning of -M for git-log

224

225 +Will merge to 'next'.

226 +

227 * mc/maint-zoneparse (2010-05-17) 1 commit

228 - Add "Z" as an alias for the timezone "UTC"

229

230 +Will merge to 'next'.

231 +

232 * mg/notes-dry-run (2010-05-14) 1 commit

233 - notes: dry-run and verbose options for prune

234

235 +Will merge to 'next'.

236 +

237 * mg/rev-parse-lrbranches-locals (2010-05-14) 1 commit

238 - revlist: Introduce --lrbranches and --locals revision specifiers

239 (this branch uses mg/rev-parse-option-sifter-deprecation.)

240

241 +Hmmm...

242 +

243 * mg/rev-parse-option-sifter-deprecation (2010-05-14) 3 commits

244 - t6018: make sure all tested symbolic names are different revs

245 - t6018: add tests for rev-list's --branches and --tags

246 - rev-parse: deprecate use as an option sifter

247 (this branch is used by mg/rev-parse-lrbranches-locals.)

248

249 +Some people might interpret "Deprecate" too strongly; the intent is that

250 +we shouldn't keep piling parsing of new rev-list options to it and

251 +discourage the use of "option sifter" in new programs.

252 +

253 * ab/cvsserver (2010-05-15) 6 commits

254 - git-cvsserver: test for pserver authentication support

255 - git-cvsserver: document making a password without htpasswd

@@ -254,6 +258,8 @@ There are gitk patches that go with this series.

258 - git-cvsserver: use a password file cvsserver pserver

259 - git-cvsserver: authentication support for pserver

260

261 +Will merge to 'next'.

262 +

263 * eb/core-eol (2010-05-19) 4 commits

264 - Add "core.eol" config variable

265 - Rename the "crlf" attribute "text"

@@ -261,14 +267,20 @@ There are gitk patches that go with this series.

267 - Add tests for per-repository eol normalization

268 (this branch uses fg/autocrlf.)

269

270 +Will merge to 'next'.

271 +

272 * jn/remote-set-branches (2010-05-19) 1 commit

273 - Add git remote set-branches

274

275 +Will merge to 'next'.

276 +

277 * js/maint-windows (2009-07-20) 2 commits

278 (merged to 'next' on 2010-05-21 at 16abe03)

279 + Recent MinGW has a C99 implementation of snprintf functions

280 + mingw: use _commit to implement fsync

281

282 +Will merge to 'next'.

283 +

284 * rs/grep-binary (2010-05-22) 8 commits

285 - grep: support NUL chars in search strings for -F

286 - grep: use REG_STARTEND for all matching if available

@@ -279,62 +291,33 @@ There are gitk patches that go with this series.

291 - grep: grep: refactor handling of binary mode options

292 - grep: add test script for binary file handling

293

294 +Will merge to 'next'.

295 +

296 * ab/submodule-foreach-toplevel (2010-05-21) 1 commit

297 - git-submodule foreach: Add $toplevel variable

298

285 -* cb/ls-files-cdup (2010-05-22) 1 commit

299 +Will merge to 'next'.

300 +

301 +* cb/ls-files-cdup (2010-05-26) 1 commit

302 - ls-files: allow relative pathspec

303

304 +Doesn't write_name() quote twice when prefix_offset is non-zero?

305 +

306 * jk/maint-pull-dry-run-noop (2010-05-25) 1 commit

307 - pull: do nothing on --dry-run

308

309 +Will merge to 'next'.

310 +

311 * jk/maint-sha1-file-name-fix (2010-05-22) 1 commit

312 - remove over-eager caching in sha1_file_name

313

314 +Will merge to 'next'.

315 +

316 * jk/url-decode (2010-05-23) 2 commits

317 - decode file:// and ssh:// URLs

318 - make url-related functions reusable

319

298 ---------------------------------------------------

299 -[Stalled]

300 -

301 -* jc/rev-list-ancestry-path (2010-04-20) 1 commit

302 - - revision: --ancestry-path

303 -

304 -Just an illustration patch. merge simplification logic used when

305 -pathspecs are in effect interacts with this rather badly.

306 -

307 -* js/rebase-origin-x (2010-02-05) 1 commit

308 - - [RFC w/o test and incomplete] rebase: add -x option to record original commit name

309 -

310 -I retract my objection against the idea of -x; needs polishing before

311 -moving forward.

312 -

313 -* js/grep-open (2010-05-01) 3 commits

314 - - grep: do not ignore return value from chdir()

315 - - grep -O: allow optional argument specifying the pager (or editor)

316 - - grep: Add the option '--open-files-in-pager'

317 - (this branch is used by jp/hold-string-list-sanity.)

318 -

319 -Probably needs to support --no-index mode as well.

320 -

321 -* jp/hold-string-list-sanity (2010-04-06) 9 commits

322 - . string_list: Fix argument order for string_list_append

323 - . Merge branch 'sr/remote-helper-export' into HEAD

324 - . Merge branch 'js/grep-open' into HEAD

325 - . Merge branch 'sb/fmt-merge-msg' into HEAD

326 - . string_list: Fix argument order for string_list_lookup

327 - . string_list: Fix argument order for string_list_insert_at_index

328 - . string_list: Fix argument order for string_list_insert

329 - . string_list: Fix argument order for for_each_string_list

330 - . string_list: Fix argument order for print_string_list

331 - (this branch uses js/grep-open.)

332 -

333 -Building this on top of slushy codebase is not a very promising endeavor.

334 -Good thing to do, but it came at a bad time.

335 -

336 ---------------------------------------------------

337 -[Cooking]

320 +Will merge to 'next'.

321

322 * bw/diff-metainfo-color (2010-05-04) 1 commit

323 (merged to 'next' on 2010-05-21 at 3aa552e)

@@ -347,6 +330,8 @@ Good thing to do, but it came at a bad time.

330 * rc/ls-remote-default (2010-05-12) 1 commit

331 - ls-remote: print URL when no repo is specified

332

333 +Will merge to 'next'.

334 +

335 * fg/autocrlf (2010-05-12) 1 commit

336 (merged to 'next' on 2010-05-21 at 5f43b66)

337 + autocrlf: Make it work also for un-normalized repositories

@@ -382,6 +367,8 @@ Good thing to do, but it came at a bad time.

367 - gitweb: Refactor syntax highlighting support

368 - gitweb: Syntax highlighting support

369

370 +Will merge to 'next'.

371 +

372 * jn/maint-amend-missing-name (2010-05-02) 1 commit

373 (merged to 'next' on 2010-05-09 at 9023332)

374 + commit --amend: cope with missing display name

@@ -422,6 +409,8 @@ Good thing to do, but it came at a bad time.

409 - convert: Keep foreign $Id$ on checkout.

410 - convert: Safer handling of $Id$ contraction.

411

412 +Will merge to 'next'.

413 +

414 * js/async-thread (2010-03-09) 7 commits

415 (merged to 'next' on 2010-05-21 at 9d31940)

416 + Enable threaded async procedures whenever pthreads is available

@@ -438,4 +427,23 @@ Good thing to do, but it came at a bad time.

427 * ld/discovery-limit-to-fs (2010-04-04) 1 commit

428 - write-index: check and warn when worktree crosses a filesystem boundary

429

441 -This one is a bit iffy.

430 +There might have been some valid objections to this but I cannot recall.

431 +Will merge to 'next' unless I hear something within a few days.

432 +

433 +--------------------------------------------------

434 +[Discarded, perhaps can be rerolled]

435 +

436 +* jp/hold-string-list-sanity (2010-04-06) 9 commits

437 + . string_list: Fix argument order for string_list_append

438 + . Merge branch 'sr/remote-helper-export' into HEAD

439 + . Merge branch 'js/grep-open' into HEAD

440 + . Merge branch 'sb/fmt-merge-msg' into HEAD

441 + . string_list: Fix argument order for string_list_lookup

442 + . string_list: Fix argument order for string_list_insert_at_index

443 + . string_list: Fix argument order for string_list_insert

444 + . string_list: Fix argument order for for_each_string_list

445 + . string_list: Fix argument order for print_string_list

446 + (this branch uses js/grep-open.)

447 +

448 +Building this on top of slushy codebase is not a very promising endeavor.

449 +Good thing to do, but it came at a bad time.

What's cooking (2010/05 #06)