e8c44d91b9 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

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

3 -X-master-at: bdc4204119d2847ea8f1ae5e44614be859951822

4 -X-next-at: c7bbdb20f017cfc4f70c5cad0067b0a3e6650153

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

3 +X-master-at: d0b8d79510cd9c45a4c6bc08a37c6348f8293e8a

4 +X-next-at: b2df7f8c29b2dd50cec1b3a7b83887ad946e4685

5

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

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

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

8

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

@@ -11,179 +11,247 @@ 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 -Many topics that have been cooking since 1.7.1 pre-release freeze period

15 -are now in master; maybe it is a good time to start freezing feature

16 -branches for 1.7.2---I think I said I'll keep this cycle shorter, no?

14 +--------------------------------------------------

15 +[Graduated to "master"]

16

18 -Btw, fwiw, I recently took a position with Google. The primary

19 -development machine has been unpacked but I still haven't managed to get

20 -back to speed yet.

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

18 + (merged to 'next' on 2010-06-03 at 9f66c99)

19 + + git-cvsserver: test for pserver authentication support

20 + + git-cvsserver: document making a password without htpasswd

21 + + git-cvsserver: Improved error handling for pserver

22 + + git-cvsserver: indent & clean up authdb code

23 + + git-cvsserver: use a password file cvsserver pserver

24 + + git-cvsserver: authentication support for pserver

25

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

23 -[New Topics]

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

27 + (merged to 'next' on 2010-06-03 at fff7253)

28 + + git-submodule foreach: Add $toplevel variable

29 +

30 +* ab/test-cleanup (2010-05-07) 2 commits

31 + (merged to 'next' on 2010-05-21 at a3cbd67)

32 + + Turn setup code in t2007-checkout-symlink.sh into a test

33 + + Move t6000lib.sh to lib-*

34

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

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

36 + (merged to 'next' on 2010-06-03 at f1bc101)

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

38

28 -Will merge to 'next'.

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

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

41 + + diff: fix coloring of extended diff headers

42

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

43 +* cb/assume-unchanged-fix (2010-05-01) 2 commits

44 + (merged to 'next' on 2010-05-21 at bab2342)

45 + + Documentation: git-add does not update files marked "assume unchanged"

46 + + do not overwrite files marked "assume unchanged"

47

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

35 -barking up a wrong tree.

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

49 + (merged to 'next' on 2010-06-03 at 4a86bbd)

50 + + docs: clarify meaning of -M for git-log

51

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.)

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

53 + (merged to 'next' on 2010-06-03 at 45236e3)

54 + + pull: do nothing on --dry-run

55

43 -Will merge to 'next'.

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

57 + (merged to 'next' on 2010-06-03 at f7dd263)

58 + + remove over-eager caching in sha1_file_name

59

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

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

61 + (merged to 'next' on 2010-06-03 at 5fc3811)

62 + + fsck: fix bogus commit header check

63

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

50 -sensible.

64 +* jn/gitweb-syntax-highlight (2010-04-27) 2 commits

65 + (merged to 'next' on 2010-06-03 at 1685303)

66 + + gitweb: Refactor syntax highlighting support

67 + + gitweb: Syntax highlighting support

68

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.)

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

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

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

72

59 -Will merge to 'next'.

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

74 + (merged to 'next' on 2010-06-03 at 01b4f6a)

75 + + gitignore.5: Clarify matching rules

76

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

77 +* jn/make-header-dependency (2010-05-08) 2 commits

78 + (merged to 'next' on 2010-05-21 at d4ed230)

79 + + Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES

80 + + Makefile: fix header dependency checker to allow NO_CURL builds

81

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.

82 +* jn/notes-doc (2010-05-08) 8 commits

83 + (merged to 'next' on 2010-05-21 at 1c28059)

84 + + Documentation/notes: nitpicks

85 + + Documentation/notes: clean up description of rewriting configuration

86 + + Documentation/notes: simplify treatment of default display refs

87 + + Documentation/log: add a CONFIGURATION section

88 + + Documentation/notes: simplify treatment of default notes ref

89 + + Documentation/notes: add configuration section

90 + + Documentation/notes: describe content of notes blobs

91 + + Documentation/notes: document format of notes trees

92

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

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

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

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

95 + + Recent MinGW has a C99 implementation of snprintf functions

96 + + mingw: use _commit to implement fsync

97

75 -Will merge to 'next'.

98 +* js/try-to-free-stackable (2010-05-08) 2 commits

99 + (merged to 'next' on 2010-05-21 at 4c1afcb)

100 + + Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used

101 + + Have set_try_to_free_routine return the previous routine

102

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

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

104 + (merged to 'next' on 2010-06-03 at 2b6cc2e)

105 + + Add "Z" as an alias for the timezone "UTC"

106

85 -Will merge to 'next'.

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

108 + (merged to 'next' on 2010-06-03 at eddf5f6)

109 + + notes: dry-run and verbose options for prune

110

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

111 +* rs/diff-no-minimal (2010-05-02) 1 commit

112 + (merged to 'next' on 2010-05-09 at 6c74aa0)

113 + + git diff too slow for a file

114

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'.

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

116 + (merged to 'next' on 2010-06-03 at 6ec4dfc)

117 + + grep: support NUL chars in search strings for -F

118 + + grep: use REG_STARTEND for all matching if available

119 + + grep: continue case insensitive fixed string search after NUL chars

120 + + grep: use memmem() for fixed string search

121 + + grep: --name-only over binary

122 + + grep: --count over binary

123 + + grep: grep: refactor handling of binary mode options

124 + + grep: add test script for binary file handling

125

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

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

126 +* wp/pretty-enhancement (2010-05-08) 4 commits

127 + (merged to 'next' on 2010-05-09 at eeaa4dc)

128 + + pretty: initialize new cmt_fmt_map to 0

129 + + pretty: add aliases for pretty formats

130 + + pretty: add infrastructure for commit format aliases

131 + + pretty: make it easier to add new formats

132

127 -Will merge to 'next'.

133 +--------------------------------------------------

134 +[New Topics]

135

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

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

136 +* ab/blame-textconv (2010-06-07) 3 commits

137 + - t/t8006: test textconv support for blame

138 + - textconv: support for blame

139 + - textconv: make the API public

140 + (this branch is used by cp/textconv-cat-file.)

141

132 -Will merge to 'next'.

142 +* ab/i18n (2010-06-15) 3 commits

143 + . Add initial C, Shell and Perl gettext translations

144 + . fixup! Add infrastructure

145 + . Add infrastructure for translating Git with gettext

146

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

135 - - Documentation/checkout: clarify description

147 +* ab/tap (2010-06-09) 4 commits

148 + - We use TAP so the Perl test can run without scaffolding

149 + - Skip tests in a way that makes sense under TAP

150 + - Merge branch 'jc/t9129-any-utf8' into ab/tap

151 + - Make test-lib.sh emit valid TAP format

152 + (this branch uses jc/t9129-any-utf8.)

153

137 -Will merge to 'next'.

154 +* bd/maint-unpack-trees-parawalk-fix (2010-06-10) 1 commit

155 + - unpack-trees: Make index lookahead less pessimal

156

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

140 - - fsck: fix bogus commit header check

157 +* ic/maint-rebase-i-abort (2010-06-08) 1 commit

158 + - rebase -i: Abort cleanly if new base cannot be checked out

159

142 -Will merge to 'next'.

160 +* jk/maint-advice-empty-amend (2010-06-06) 1 commit

161 + - commit: give advice on empty amend

162

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

145 - - gitignore.5: Clarify matching rules

163 +* jl/maint-diff-ignore-submodules (2010-06-08) 2 commits

164 + - Add optional parameters to the diff option "--ignore-submodules"

165 + - git diff: rename test that had a conflicting name

166

147 -Will merge to 'next'.

167 +* jn/document-rebase-i-p-limitation (2010-05-31) 1 commit

168 + - rebase -i -p: document shortcomings

169

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

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

170 +* jn/grep-open (2010-06-12) 4 commits

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

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

173 + - Unify code paths of threaded greps

174 + - grep: refactor grep_objects loop into its own function

175

152 -Will merge to 'next'.

176 +* rr/parse-date-refactor (2010-06-03) 1 commit

177 + - Refactor parse_date for approxidate functions

178

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

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

179 +* rr/svn-export (2010-06-10) 7 commits

180 + - Add LICENSE

181 + - Add SVN dump parser

182 + - Add infrastructure to write revisions in fast-export format

183 + - Add stream helper library

184 + - Add library for string-specific memory pool

185 + - Add cpp macro implementation of treaps

186 + - Add memory pool library

187

157 -Will merge to 'next'.

188 +* sm/branch-broken-ref (2010-06-04) 2 commits

189 + - branch: don't fail listing branches if one of the commits wasn't found

190 + - branch: exit status now reflects if branch listing finds an error

191

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

192 +* tr/receive-pack-aliased-update-fix (2010-06-10) 1 commit

193 + (merged to 'next' on 2010-06-14 at d3a3097)

194 + + check_aliased_update: strcpy() instead of strcat() to copy

195 + (this branch is used by js/maint-receive-pack-symref-alias.)

196

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

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

197 +* cc/maint-commit-reflog-msg (2010-06-12) 1 commit

198 + - commit: use value of GIT_REFLOG_ACTION env variable as reflog message

199

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

200 +* tr/rev-list-count (2010-06-12) 2 commits

201 + - bash completion: Support "divergence from upstream" warnings in __git_ps1

202 + - rev-list: introduce --count option

203

174 -Will merge to 'next'.

204 +* tr/send-email-8bit (2010-06-12) 1 commit

205 + - send-email: ask about and declare 8bit mails

206

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

177 - - t9129: fix UTF-8 locale detection

207 +* cp/textconv-cat-file (2010-06-09) 4 commits

208 + - [DONTMERGE] git gui: use textconv filter for diff and blame

209 + - t/t8007: test textconv support for cat-file

210 + - textconv: support for cat_file

211 + - sha1_name: add get_sha1_with_context()

212 + (this branch uses ab/blame-textconv.)

213

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

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

214 +* jn/gitweb-return-or-exit-cleanup (2010-06-13) 1 commit

215 + - gitweb: Return or exit after done serving request

216

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

183 - - revision: --ancestry-path

217 +* pb/maint-perl-errmsg-no-dir (2010-06-14) 1 commit

218 + - Git.pm: better error message

219 +

220 +* zl/mailinfo-recode-patch (2010-06-14) 2 commits

221 + - add --recode-patch option to git-am

222 + - add --recode-patch option to git-mailinfo

223 +

224 +* cc/cherry-pick-stdin (2010-06-14) 3 commits

225 + - revert: do not rebuild argv on heap

226 + - revert: accept arbitrary rev-list options

227 + - t3508 (cherry-pick): futureproof against unmerged files

228 + (this branch uses cc/cherry-pick-series.)

229 +

230 +* eb/double-convert-before-merge (2010-06-16) 1 commit

231 + - ll-merge: Normalize files before merging

232 +

233 +* jc/maint-simpler-common-prefix (2010-06-16) 1 commit

234 + - common_prefix: simplify and fix scanning for prefixes

235 +

236 +* js/maint-am-rebase-invalid-author (2010-06-16) 1 commit

237 + - am: use get_author_ident_from_commit instead of mailinfo when rebasing

238

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

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

239 +* js/maint-receive-pack-symref-alias (2010-06-16) 1 commit

240 + . Merge branch 'tr/receive-pack-aliased-update-fix' into js/maint-receive-pack-symref-alias

241 + (this branch uses tr/receive-pack-aliased-update-fix.)

242 +

243 +* lt/extended-sha1-match-commit-with-regexp (2010-04-23) 1 commit

244 + - Make :/ accept a regex rather than a fixed pattern

245 +

246 +* mg/pretty-magic-space (2010-06-14) 1 commit

247 + - pretty: Introduce ' ' modifier to add space if non-empty

248 +

249 +* sb/format-patch-signature (2010-06-15) 2 commits

250 + - completion: Add --signature and format.signature

251 + - format-patch: Add a signature option (--signature)

252 +

253 +--------------------------------------------------

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

255

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

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

@@ -191,55 +259,174 @@ pathspecs are in effect interacts with this rather badly.

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

260 moving forward.

261

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 -

262 --------------------------------------------------

263 [Cooking]

264

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

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

265 +* jc/rev-list-ancestry-path (2010-06-04) 5 commits

266 + - revision: Turn off history simplification in --ancestry-path mode

267 + - revision: Fix typo in --ancestry-path error message

268 + - Documentation/rev-list-options.txt: Explain --ancestry-path

269 + - Documentation/rev-list-options.txt: Fix missing line in example history graph

270 + - revision: --ancestry-path

271

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.

272 +* cc/maint-diff-CC-binary (2010-05-26) 1 commit

273 + (merged to 'next' on 2010-06-07 at 1a8bbbb)

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

275

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

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

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

277 + (merged to 'next' on 2010-06-03 at c54f1bf)

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

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

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

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

282

220 -Will merge to 'next'.

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

284 + (merged to 'next' on 2010-06-07 at d1e3f9e)

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

286 + + Show branch information in short output of git status

287 +

288 +* ps/gitweb-soc (2010-06-02) 6 commits

289 + (merged to 'next' on 2010-06-13 at 92245ae)

290 + + git-instaweb: Add option to reuse previous config file

291 + + Makefile: Use $(sharedir)/gitweb for target 'install-gitweb'

292 + (merged to 'next' on 2010-06-03 at 5db4adf)

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

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

295 + + gitweb: Set default destination directory for installing gitweb in Makefile

296 + + gitweb: Move static files into seperate subdirectory

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

298

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

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

299 +* tc/commit-abbrev-fix (2010-06-12) 3 commits

300 + (merged to 'next' on 2010-06-16 at b2df7f8)

301 + + commit::print_summary(): don't use format_commit_message()

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

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

304

225 -Will merge to 'next'.

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

306 + (merged to 'next' on 2010-06-07 at 83cf3b8)

307 + + Makefile: remove redundant munging of @@INSTLIBDIR@@

308

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

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

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

310 + (merged to 'next' on 2010-06-07 at 8771aae)

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

312 + + graph.c: register a callback for graph output

313 + + Emit a whole line in one go

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

315 + + Output the graph columns at the end of the commit message

316 + + Add a prefix output callback to diff output

317

230 -Will merge to 'next'.

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

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

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

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

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

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

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

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

326 + - revert: cleanup code for -x option

327 + (this branch is used by cc/cherry-pick-stdin.)

328 +

329 +* gs/usage-to-stdout (2010-06-12) 2 commits

330 + (merged to 'next' on 2010-06-13 at e83c00f)

331 + + parseopt: wrap rev-parse --parseopt usage for eval consumption

332 + (merged to 'next' on 2010-06-03 at c81c783)

333 + + print the usage string on stdout instead of stderr

334 +

335 +* gv/portable (2010-06-11) 20 commits

336 + (merged to 'next' on 2010-06-13 at 1add99c)

337 + + test-lib: use DIFF definition from GIT-BUILD-OPTIONS

338 + (merged to 'next' on 2010-06-07 at 1796035)

339 + + build: propagate $DIFF to scripts

340 + (merged to 'next' on 2010-06-03 at 41ae9cb)

341 + + Makefile: Tru64 portability fix

342 + + Makefile: HP-UX 10.20 portability fixes

343 + + Makefile: HPUX11 portability fixes

344 + + Makefile: SunOS 5.6 portability fix

345 + + inline declaration does not work on AIX

346 + + Allow disabling "inline"

347 + + Some platforms lack socklen_t type

348 + + Make NO_{INET_NTOP,INET_PTON} configured independently

349 + + Makefile: some platforms do not have hstrerror anywhere

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

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

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

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

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

355 + + enums: omit trailing comma for portability

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

357 + + Rewrite dynamic structure initializations to runtime assignment

358 + + Makefile: pass CPPFLAGS through to fllow customization

359

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

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

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

361 + (merged to 'next' on 2010-06-07 at 194e9a9)

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

363 +

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

365 + (merged to 'next' on 2010-06-07 at f49577f)

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

367 +

368 +* jn/checkout-doc (2010-06-01) 2 commits

369 + (merged to 'next' on 2010-06-13 at d01c620)

370 + + Documentation/checkout: clarify description

371 + (merged to 'next' on 2010-06-07 at 93cc6a9)

372 + + Documentation/checkout: clarify description

373 +

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

375 + (merged to 'next' on 2010-06-07 at 5e6cffe)

376 + + rebase: improve error message when upstream argument is missing

377

235 -Will merge to 'next'.

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

379 + (merged to 'next' on 2010-06-07 at a0fef35)

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

381 +

382 +* bc/portable (2010-06-09) 7 commits

383 + (merged to 'next' on 2010-06-13 at a423055)

384 + + Remove python 2.5'isms

385 + + Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS

386 + (merged to 'next' on 2010-06-07 at 27a57c9)

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

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

389 + + t/t5150: remove space from sed script

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

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

392 +

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

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

395 +

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

397 + (merged to 'next' on 2010-06-07 at 12383bc)

398 + + git am: Remove stray error message from sed

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

400 + + git am: Set cmdline globally

401 +

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

403 + (merged to 'next' on 2010-06-07 at 6f53da4)

404 + + t9129: fix UTF-8 locale detection

405 + (this branch is used by ab/tap.)

406 +

407 +* em/checkout-orphan (2010-06-10) 6 commits

408 + (merged to 'next' on 2010-06-12 at 2f531d5)

409 + + log_ref_setup: don't return stack-allocated array

410 + (merged to 'next' on 2010-06-07 at 23b4607)

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

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

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

414 + + refs: split log_ref_write logic into log_ref_setup

415 + + Documentation: alter checkout --orphan description

416 +

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

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

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

420 +do.

421 +

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

423 + (merged to 'next' on 2010-06-03 at 75fefba)

424 + + diff: add configuration option for disabling diff prefixes.

425

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

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

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

429

241 -Hmmm...

242 -

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

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

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

@@ -250,87 +437,34 @@ Some people might interpret "Deprecate" too strongly; the intent is that

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

438 discourage the use of "option sifter" in new programs.

439

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

256 - - git-cvsserver: Improved error handling for pserver

257 - - git-cvsserver: indent & clean up authdb code

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

440 +* eb/core-eol (2010-06-04) 4 commits

441 - Add "core.eol" config variable

442 - Rename the "crlf" attribute "text"

443 - Add per-repository eol normalization

444 - Add tests for per-repository eol normalization

445 (this branch uses fg/autocrlf.)

446

270 -Will merge to 'next'.

271 -

447 * 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

287 - - grep: continue case insensitive fixed string search after NUL chars

288 - - grep: use memmem() for fixed string search

289 - - grep: --name-only over binary

290 - - grep: --count over binary

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 -

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

448 + (merged to 'next' on 2010-06-03 at 54a1755)

449 + + Add git remote set-branches

450

314 -Will merge to 'next'.

451 +* cb/ls-files-cdup (2010-06-03) 2 commits

452 + (merged to 'next' on 2010-06-07 at 89277b8)

453 + + ls-files: allow relative pathspec

454 + + quote.c: separate quoting and relative path generation

455

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

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

318 - - make url-related functions reusable

319 -

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)

324 - + diff: fix coloring of extended diff headers

457 + (merged to 'next' on 2010-06-03 at 0d8a51e)

458 + + decode file:// and ssh:// URLs

459 + + make url-related functions reusable

460

461 * ph/clone-message-reword (2010-05-09) 1 commit

462 (merged to 'next' on 2010-05-21 at 1785bd0)

463 + clone: reword messages to match the end-user perception

464

465 * 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'.

466 + (merged to 'next' on 2010-06-03 at 8d505fb)

467 + + ls-remote: print URL when no repo is specified

468

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

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

@@ -348,70 +482,21 @@ Will merge to 'next'.

482 + t7604-merge-custom-message: show that --log doesn't append to -m

483 + t7604-merge-custom-message: shift expected output creation

484

351 -* jn/gitweb-fastcgi (2010-05-07) 2 commits

485 +* jn/gitweb-fastcgi (2010-06-05) 3 commits

486 + (merged to 'next' on 2010-06-13 at 6d1fdd6)

487 + + gitweb: Run in FastCGI mode if gitweb script has .fcgi extension

488 (merged to 'next' on 2010-05-21 at cb1724f)

489 + gitweb: Add support for FastCGI, using CGI::Fast

490 + gitweb: Put all per-connection code in run() subroutine

491

356 -* jn/make-header-dependency (2010-05-08) 2 commits

357 - (merged to 'next' on 2010-05-21 at d4ed230)

358 - + Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES

359 - + Makefile: fix header dependency checker to allow NO_CURL builds

360 -

361 -* js/try-to-free-stackable (2010-05-08) 2 commits

362 - (merged to 'next' on 2010-05-21 at 4c1afcb)

363 - + Do not call release_pack_memory in malloc wrappers when GIT_TRACE is used

364 - + Have set_try_to_free_routine return the previous routine

365 -

366 -* jn/gitweb-syntax-highlight (2010-04-27) 2 commits

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

375 -

376 -* rs/diff-no-minimal (2010-05-02) 1 commit

377 - (merged to 'next' on 2010-05-09 at 6c74aa0)

378 - + git diff too slow for a file

379 -

380 -* ab/test-cleanup (2010-05-07) 2 commits

381 - (merged to 'next' on 2010-05-21 at a3cbd67)

382 - + Turn setup code in t2007-checkout-symlink.sh into a test

383 - + Move t6000lib.sh to lib-*

384 -

385 -* jn/notes-doc (2010-05-08) 8 commits

386 - (merged to 'next' on 2010-05-21 at 1c28059)

387 - + Documentation/notes: nitpicks

388 - + Documentation/notes: clean up description of rewriting configuration

389 - + Documentation/notes: simplify treatment of default display refs

390 - + Documentation/log: add a CONFIGURATION section

391 - + Documentation/notes: simplify treatment of default notes ref

392 - + Documentation/notes: add configuration section

393 - + Documentation/notes: describe content of notes blobs

394 - + Documentation/notes: document format of notes trees

395 -

396 -* cb/assume-unchanged-fix (2010-05-01) 2 commits

397 - (merged to 'next' on 2010-05-21 at bab2342)

398 - + Documentation: git-add does not update files marked "assume unchanged"

399 - + do not overwrite files marked "assume unchanged"

400 -

401 -* wp/pretty-enhancement (2010-05-08) 4 commits

402 - (merged to 'next' on 2010-05-09 at eeaa4dc)

403 - + pretty: initialize new cmt_fmt_map to 0

404 - + pretty: add aliases for pretty formats

405 - + pretty: add infrastructure for commit format aliases

406 - + pretty: make it easier to add new formats

407 -

492 * hg/id-munging (2010-04-06) 2 commits

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

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

411 -

412 -Will merge to 'next'.

493 + (merged to 'next' on 2010-06-03 at b045725)

494 + + convert: Keep foreign $Id$ on checkout.

495 + + convert: Safer handling of $Id$ contraction.

496

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

497 +* js/async-thread (2010-06-11) 8 commits

498 + (merged to 'next' on 2010-06-13 at bf7457c)

499 + + fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)

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

501 + Enable threaded async procedures whenever pthreads is available

502 (merged to 'next' on 2010-05-04 at 2644e74)

@@ -422,28 +507,15 @@ Will merge to 'next'.

507 + Make report() from usage.c public as vreportf() and use it.

508 + Modernize t5530-upload-pack-error.

509

425 -(all except for the tip has been in 'next' since 2010-03-20).

426 -

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

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

510 +--------------------------------------------------

511 +[Discarded]

512

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.

513 +* ld/discovery-limit-to-fs (2010-06-12) 2 commits

514 + (merged to 'next' on 2010-06-11 at 9c3410c)

515 + + Revert "write-index: check and warn when worktree crosses a filesystem

516 + boundary"

517 + (merged to 'next' on 2010-06-07 at 9780e62)

518 + + write-index: check and warn when worktree crosses a filesystem

519 + boundary

520

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.

521 +These are "let's try this" followed by "oops, let's not".

What's cooking (2010/06 #02)