cedfdc61d9 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (May 2010, #03; Sun, 9)

3 -X-master-at: 212f0ba357cde43d1cf66692f73a2f662d13ac55

4 -X-next-at: 07419c952633f427ce186bf4c2b9a49592c9d3d3

2 +Subject: What's cooking in git.git (May 2010, #04; Wed, 12)

3 +X-master-at: 0e4607c09d72ada4942ea49298dba83ec4145892

4 +X-next-at: 7d1e8fef7ffce7fe8e9fa8fae99aaa15468fb6d3

5

6 -What's cooking in git.git (May 2010, #03; Sun, 9)

6 +What's cooking in git.git (May 2010, #04; Wed, 12)

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

8

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

@@ -11,163 +11,34 @@ 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 -Tonight's 'master' merges many topics that has been cooking for a few

15 -weeks in 'next' as the first batch of 1.7.2 cycle. I will be moving some

16 -topics in 'pu' to 'next' as the next step tomorrow. I'm in the middle of

17 -moving and I expect that I won't be back up to speed until later this

18 -month.

14 +I'll be packing my primary machine tomorrow morning, and hopefully I can

15 +resume my git activity early next week. This will be the last pushout

16 +until then.

17

18 --------------------------------------------------

19 [New Topics]

20

23 -* jn/gitweb-fastcgi (2010-05-07) 5 commits

24 - - gitweb: Add support for FastCGI, using CGI::Fast

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

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

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

28 - - Export more test-related variables when running external tests

29 - (this branch shares commits with jn/gitweb-caching-prep.)

30 -

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

32 - - Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES

33 - - Makefile: fix header dependency checker to allow NO_CURL builds

34 -

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

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

37 - - Have set_try_to_free_routine return the previous routine

38 - (this branch uses np/malloc-threading.)

39 -

40 -Should be Ok for 'next'.

41 -

42 ---------------------------------------------------

43 -[Graduated to "master"]

44 -

45 -* ab/commit-empty-message (2010-04-06) 1 commit

46 - (merged to 'next' on 2010-05-04 at 54c2e47)

47 - + Add option to git-commit to allow empty log messages

48 -

49 -(has been in 'next' since 2010-04-07)

50 -

51 -* bg/apply-blank-trailing-context (2010-04-08) 1 commit

52 - (merged to 'next' on 2010-05-04 at 31f3482)

53 - + apply: Allow blank *trailing* context lines to match beyond EOF

54 -

55 -(has been in 'next' since 2010-04-14)

56 -

57 -* bg/send-email-smtpdomain (2010-04-10) 4 commits

58 - (merged to 'next' on 2010-05-04 at 2afbe2c)

59 - + send-email: Cleanup smtp-domain and add config

60 - + Document send-email --smtp-domain

61 - + send-email: Don't use FQDNs without a '.'

62 - + send-email: Cleanup { style

63 -

64 -(has been in 'next' since 2010-04-14)

65 -

66 -* cc/revert-strategy (2010-03-31) 5 commits

67 - (merged to 'next' on 2010-05-04 at 6d44a83)

68 - + revert: add "--strategy" option to choose merge strategy

69 - + merge: make function try_merge_command non static

70 - + merge: refactor code that calls "git merge-STRATEGY"

71 - + revert: refactor merge recursive code into its own function

72 - + revert: use strbuf to refactor the code that writes the merge message

73 -

74 -(has been in 'next' since 2010-04-05)

75 -

76 -* cw/ws-indent-with-tab (2010-04-03) 6 commits

77 - (merged to 'next' on 2010-05-04 at 1d7aca4)

78 - + whitespace: tests for git-apply --whitespace=fix with tab-in-indent

79 - + whitespace: add tab-in-indent support for --whitespace=fix

80 - + whitespace: replumb ws_fix_copy to take a strbuf *dst instead of char *dst

81 - + whitespace: tests for git-diff --check with tab-in-indent error class

82 - + whitespace: add tab-in-indent error class

83 - + whitespace: we cannot "catch all errors known to git" anymore

84 -

85 -(has been in 'next' since 2010-04-05)

86 -

87 -* eb/unpretty-b-format (2010-03-24) 1 commit

88 - (merged to 'next' on 2010-05-04 at a466ed8)

89 - + Add `%B' in format strings for raw commit body in `git log' and friends

90 -

91 -(has been in 'next' since 2010-04-07)

92 -

93 -* hg/maint-attr-fix (2010-04-06) 3 commits

94 - (merged to 'next' on 2010-05-04 at 8b98845)

95 - + attr: Expand macros immediately when encountered.

96 - + attr: Allow multiple changes to an attribute on the same line.

97 - + attr: Fixed debug output for macro expansion.

98 -

99 -(has been in 'next' since 2010-04-14)

100 -

101 -* jc/maint-reflog-expire-unreachable (2010-04-07) 1 commit

102 - (merged to 'next' on 2010-05-04 at 4efe837)

103 - + reflog --expire-unreachable: avoid merge-base computation

104 - (this branch is used by jc/maint-no-reflog-expire-unreach-for-head.)

105 -

106 -(has been in 'next' since 2010-04-22)

107 -

108 -* jc/test-sleepless (2010-04-06) 1 commit

109 - (merged to 'next' on 2010-05-04 at 9ff84b0)

110 - + war on "sleep" in tests

111 -

112 -(has been in 'next' since 2010-04-07)

113 -

114 -* jk/cached-textconv (2010-04-01) 5 commits

115 - (merged to 'next' on 2010-05-04 at e4b72a0)

116 - + diff: avoid useless filespec population

117 - + diff: cache textconv output

118 - + textconv: refactor calls to run_textconv

119 - + introduce notes-cache interface

120 - + make commit_tree a library function

121 -

122 -(has been in 'next' since 2010-04-02)

123 -

124 -* mh/status-optionally-refresh (2010-04-03) 3 commits

125 - (merged to 'next' on 2010-05-04 at be164f0)

126 - + t7508: add a test for "git status" in a read-only repository

127 - + git status: refresh the index if possible

128 - + t7508: add test for "git status" refreshing the index

129 -

130 -(has been in 'next' since 2010-04-05)

131 -

132 -* pc/remove-warn (2010-03-26) 4 commits

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

134 - + Remove a redundant errno test in a usage of remove_path

135 - + Introduce remove_or_warn function

136 - + Implement the rmdir_or_warn function

137 - + Generalise the unlink_or_warn function

138 -

139 -(has been in 'next' since 2010-04-02)

140 -

141 -* rc/ls-remote-default (2010-04-09) 1 commit

142 - (merged to 'next' on 2010-05-04 at 2af33e1)

143 - + ls-remote: fall-back to default remotes when no remote specified

144 -

145 -(has been in 'next' since 2010-04-14)

146 -

147 -* rc/maint-curl-helper (2010-04-08) 3 commits

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

149 - + remote-curl: ensure that URLs have a trailing slash

150 - + http: make end_url_with_slash() public

151 - + t5541-http-push: add test for URLs with trailing slash

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

22 + - [sign-off?] diff: fix coloring of extended diff headers

23

153 -(has been in 'next' since 2010-04-14)

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

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

26

155 -* sc/http-late-auth (2010-04-01) 1 commit

156 - (merged to 'next' on 2010-05-04 at 23ae2e8)

157 - + Prompt for a username when an HTTP request 401s

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

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

29

159 -(has been in 'next' since 2010-04-02)

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

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

32

161 -* sd/log-decorate (2010-04-08) 6 commits

162 - (merged to 'next' on 2010-05-04 at 6e54ae9)

163 - + log.decorate: only ignore it under "log --pretty=raw"

164 - + script with rev-list instead of log

165 - + log --pretty/--oneline: ignore log.decorate

166 - + log.decorate: usability fixes

167 - + Add `log.decorate' configuration variable.

168 - + git_config_maybe_bool()

169 -

170 -(has been in 'next' since 2010-04-08)

33 +* tc/merge-m-log (2010-05-11) 8 commits

34 + - merge: --log appends shortlog to message if specified

35 + - fmt-merge-msg: add function to append shortlog only

36 + - fmt-merge-msg: refactor merge title formatting

37 + - fmt-merge-msg: minor refactor of fmt_merge_msg()

38 + - merge: rename variable

39 + - merge: update comment

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

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

42

43 --------------------------------------------------

44 [Stalled]

@@ -210,19 +81,36 @@ Good thing to do, but it came at a bad time.

81 --------------------------------------------------

82 [Cooking]

83

84 +* jn/gitweb-fastcgi (2010-05-07) 5 commits

85 + - gitweb: Add support for FastCGI, using CGI::Fast

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

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

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

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

90 + (this branch shares commits with jn/gitweb-caching-prep.)

91 +

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

93 + - Makefile: let header dependency checker override COMPUTE_HEADER_DEPENDENCIES

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

95 +

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

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

98 + - Have set_try_to_free_routine return the previous routine

99 + (this branch uses np/malloc-threading.)

100 +

101 +Should be Ok for 'next'.

102 +

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

104 - gitweb: Refactor syntax highlighting support

105 - gitweb: Syntax highlighting support

106

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

218 - - commit --amend: cope with missing display name

219 -

220 -Should be Ok for 'next'.

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

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

110

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

223 - - git diff too slow for a file

224 -

225 -Should be Ok for 'next'.

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

113 + + git diff too slow for a file

114

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

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

@@ -231,20 +119,16 @@ Should be Ok for 'next'.

119 Should be Ok for 'next'.

120

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

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

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

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

124

236 -* by/log-follow (2010-05-06) 3 commits

237 - - Make git log --follow find copies among unmodified files.

238 - - Make diffcore_std only can run once before a diff_flush

239 - - Add a macro DIFF_QUEUE_CLEAR.

240 -

241 -Should be Ok for 'next'.

242 -

243 -* eb/crlf (2010-05-08) 4 commits

244 - - Add per-repository eol normalization

245 - - Pass eol conv mode as an argument instead of using global auto_crlf

246 - - Add tests for per-repository eol normalization

247 - - Add "core.eolStyle" variable to control end-of-line conversion

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

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

127 + + tests: rename duplicate t4205

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

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

130 + + Make diffcore_std only can run once before a diff_flush

131 + + Add a macro DIFF_QUEUE_CLEAR.

132

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

134 - Documentation/notes: nitpicks

@@ -257,10 +141,9 @@ Should be Ok for 'next'.

141 - Documentation/notes: document format of notes trees

142

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

260 - - wt-status: take advice.statusHints seriously

261 - - t7508: test advice.statusHints

262 -

263 -Should be Ok for 'next'.

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

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

146 + + t7508: test advice.statusHints

147

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

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

@@ -290,73 +173,67 @@ Should be Ok for 'next'.

173 (has been in 'next' since 2010-04-22)

174

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

293 - - remote add: add a --[no-]tags option

294 - - Honor "tagopt = --tags" configuration option

295 -

296 -Should be Ok for 'next'.

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

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

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

179

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

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

182 - do not overwrite files marked "assume unchanged"

183

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

303 - - fsck: check ident lines in commit objects

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

186 + + fsck: check ident lines in commit objects

187

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

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

190

308 -Should be Ok for 'next'.

309 -

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

311 - - gitweb: Move generating page title to separate subroutine

312 - - gitweb: Add custom error handler using die_error

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

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

315 - - Export more test-related variables when running external tests

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

193 + + gitweb: Move generating page title to separate subroutine

194 + + gitweb: Add custom error handler using die_error

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

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

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

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

199

318 -Should be Ok for 'next'.

319 -

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

321 - - gitweb: Create install target for gitweb in Makefile

322 - - gitweb: Improve installation instructions in gitweb/INSTALL

323 -

324 -Should be Ok for 'next'.

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

202 + + gitweb: Create install target for gitweb in Makefile

203 + + gitweb: Improve installation instructions in gitweb/INSTALL

204

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

327 - - gitweb: Silence 'Variable VAR may be unavailable' warnings

328 -

329 -Should be Ok for 'next'.

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

207 + + gitweb: Silence 'Variable VAR may be unavailable' warnings

208

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

332 - - t5150: protect backslash with backslash in shell

333 - - request-pull: protect against OPTIONS_KEEPDASHDASH from environment

334 - - tests for request-pull

210 + + t5150: protect backslash with backslash in shell

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

212 + + tests for request-pull

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

214

337 -* jn/request-pull (2010-04-24) 2 commits

338 - - adapt request-pull tests for new pull request format

339 - - Merge branch 'jn/maint-request-pull' into jn/request-pull

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

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

217 + + tests: chmod +x t5150

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

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

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

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

222

342 -Should be Ok for 'next'.

343 -

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

345 - - pretty: Respect --abbrev option

346 - - shortlog: Document and test --format option

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

348 - - t4201 (shortlog): guard setup with test_expect_success

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

350 -

351 -Should be Ok for 'next'.

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

225 + + pretty: Respect --abbrev option

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

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

228 + + t4201 (shortlog): guard setup with test_expect_success

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

230

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

354 - - pretty: initialize new cmt_fmt_map to 0

355 - - pretty: add aliases for pretty formats

356 - - pretty: add infrastructure for commit format aliases

357 - - pretty: make it easier to add new formats

358 -

359 -Should be Ok for 'next'.

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

233 + + pretty: initialize new cmt_fmt_map to 0

234 + + pretty: add aliases for pretty formats

235 + + pretty: add infrastructure for commit format aliases

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

237

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

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

@@ -526,3 +403,14 @@ source" scenario.

403 + Allow passing of configuration parameters in the command line

404

405 (has been in 'next' since 2010-04-07)

406 +

407 +----------------------------------------------------------------

408 +[Dropped]

409 +

410 +* eb/crlf (2010-05-08) 4 commits

411 + . Add per-repository eol normalization

412 + . Pass eol conv mode as an argument instead of using global auto_crlf

413 + . Add tests for per-repository eol normalization

414 + . Add "core.eolStyle" variable to control end-of-line conversion

415 +

416 +Perhaps will be rerolled after discussion settles.

What's cooking (2010/05 #04)