be0f544549 · matheusbsbs/matheus-bagliano

@@ -1,17 +1,18 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Feb 2012, #05; Mon, 13)

3 -X-master-at: 6f5e880c68099b185e60b2492c75e506e16d8292

4 -X-next-at: adb73538176221d26b30b46087711875caebc24b

2 +Subject: What's cooking in git.git (Feb 2012, #06; Thu, 16)

3 +X-master-at: b0d66b5110faaeb395610ba43b6eb70a18ab5e25

4 +X-next-at: a9004c5cb2204cf950debab328e86de5eefb9da4

5

6 -What's cooking in git.git (Feb 2012, #05; Mon, 13)

6 +What's cooking in git.git (Feb 2012, #06; Thu, 16)

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

8

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

10 only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

11

12 -This round mosty consists of topics to fix new features introduced in

13 -1.7.9, in preparation for 1.7.9.1 maintenance release. There are a few

14 -more of them to come.

12 +The first maintenance release v1.7.9.1 ironed out usability kinks in the

13 +new features added in v1.7.9 release. Topics that add new features and

14 +fixes that have been cooking in 'next' start to graduate to 'master'

15 +again.

16

17 You can find the changes described here in the integration branches of the

18 repositories listed at

@@ -19,7 +20,7 @@ repositories listed at

20 http://git-blame.blogspot.com/p/git-public-repositories.html

21

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

22 -[New Topics]

23 +[Graduated to "master"]

24

25 * bl/gitweb-project-filter (2012-02-12) 1 commit

26 (merged to 'next' on 2012-02-13 at 35366b8)

@@ -34,6 +35,43 @@ intermediate levels in directory hierarchies, already slated for 1.7.10.

35

36 Some systems need to explicitly link -lcharset to get locale_charset().

37

38 +* jk/git-dir-lookup (2012-02-02) 1 commit

39 + (merged to 'next' on 2012-02-05 at 1856d74)

40 + + standardize and improve lookup rules for external local repos

41 +

42 +When you have both .../foo and .../foo.git, "git clone .../foo" did not

43 +favor the former but the latter.

44 +

45 +* jk/grep-binary-attribute (2012-02-02) 9 commits

46 + (merged to 'next' on 2012-02-05 at 9dffa7e)

47 + + grep: pre-load userdiff drivers when threaded

48 + + grep: load file data after checking binary-ness

49 + + grep: respect diff attributes for binary-ness

50 + + grep: cache userdiff_driver in grep_source

51 + + grep: drop grep_buffer's "name" parameter

52 + + convert git-grep to use grep_source interface

53 + + grep: refactor the concept of "grep source" into an object

54 + + grep: move sha1-reading mutex into low-level code

55 + + grep: make locking flag global

56 +

57 +Fixes a longstanding bug that there was no way to tell "git grep" that a

58 +path may look like text but it is not, which "git diff" can do using the

59 +attributes system. Now "git grep" honors the same "binary" (or "-diff")

60 +attribute.

61 +

62 +* jk/userdiff-config-simplify (2012-02-07) 1 commit

63 + (merged to 'next' on 2012-02-10 at e9854c1)

64 + + drop odd return value semantics from userdiff_config

65 +

66 +Code cleanup.

67 +

68 +* jn/ancient-meld-support (2012-02-10) 1 commit

69 + (merged to 'next' on 2012-02-13 at 28aca31)

70 + + mergetools/meld: Use --help output to detect --output support

71 +

72 +More reliably tell if the given version of "meld" supports --output

73 +option.

74 +

75 * lt/pull-no-edit (2012-02-12) 1 commit

76 (merged to 'next' on 2012-02-13 at 352f0cb)

77 + "git pull" doesn't know "--edit"

@@ -53,116 +91,113 @@ automatically commit to record the resulting merge.

91

92 Internal API clean-up that is very cleanly done.

93

56 ---------------------------------------------------

57 -[Graduated to "master"]

58 -

59 -* bw/inet-pton-ntop-compat (2012-02-05) 1 commit

60 - (merged to 'next' on 2012-02-06 at 61303e6)

61 - + Drop system includes from inet_pton/inet_ntop compatibility wrappers

62 -

63 -The inclusion order of header files bites Solaris again and this fixes it.

94 +* nd/pack-objects-parseopt (2012-02-01) 3 commits

95 + (merged to 'next' on 2012-02-05 at d0dc25d)

96 + + pack-objects: convert to use parse_options()

97 + + pack-objects: remove bogus comment

98 + + pack-objects: do not accept "--index-version=version,"

99

65 -* fc/zsh-completion (2012-02-06) 3 commits

66 - (merged to 'next' on 2012-02-06 at c94dd12)

67 - + completion: simplify __gitcomp and __gitcomp_nl implementations

68 - + completion: use ls -1 instead of rolling a loop to do that ourselves

69 - + completion: work around zsh option propagation bug

100 +"pack-objects" learned use parse-options, losing custom command line

101 +parsing code.

102

71 -Fix git subcommand completion for zsh (in contrib/completion).

103 +--------------------------------------------------

104 +[New Topics]

105

73 -* jc/checkout-out-of-unborn (2012-02-06) 1 commit

74 - (merged to 'next' on 2012-02-07 at 60eb328)

75 - + git checkout -b: allow switching out of an unborn branch

106 +* cb/maint-rev-list-verify-object (2012-02-13) 1 commit

107 + (merged to 'next' on 2012-02-16 at a407b9a)

108 + + git rev-list: fix invalid typecast

109

77 -"checkout -b" did not allow switching out of an unborn branch.

110 +Fixes an obscure bug in "rev-list --verify" that skipped verification

111 +depending on the phase of the moon, which dates back to 1.7.8.x series.

112

79 -* jc/maint-commit-ignore-i-t-a (2012-02-07) 1 commit

80 - (merged to 'next' on 2012-02-10 at e0040cf)

81 - + commit: ignore intent-to-add entries instead of refusing

113 +* cb/maint-t5541-make-server-port-portable (2012-02-13) 1 commit

114 + (merged to 'next' on 2012-02-16 at 762eefb)

115 + + t5541: check error message against the real port number used

116

83 -Replaces the nd/commit-ignore-i-t-a series that was made unnecessary

84 -complicated by bad suggestions I made earlier.

117 +Test fix.

118

86 -* jc/maint-mailmap-output (2012-02-06) 1 commit

87 - (merged to 'next' on 2012-02-06 at 0a21425)

88 - + mailmap: always return a plain mail address from map_user()

119 +* cb/receive-pack-keep-errors (2012-02-13) 1 commit

120 + (merged to 'next' on 2012-02-16 at 9ff846e)

121 + + do not override receive-pack errors

122

90 -map_user() was not rewriting its output correctly, which resulted in the

91 -user visible symptom that "git blame -e" sometimes showed excess '>' at

92 -the end of email addresses.

123 +Sometimes error status detected by a check in an earlier phase of

124 +receive-pack (the other end of 'git push') was lost by later checks,

125 +resulting in false indication of success.

126

94 -* jk/maint-tag-show-fixes (2012-02-08) 3 commits

95 - (merged to 'next' on 2012-02-08 at 18459c4)

96 - + tag: do not show non-tag contents with "-n"

97 - + tag: die when listing missing or corrupt objects

98 - + tag: fix output of "tag -n" when errors occur

127 +* cb/transfer-no-progress (2012-02-13) 1 commit

128 + (merged to 'next' on 2012-02-16 at ff17092)

129 + + push/fetch/clone --no-progress suppresses progress output

130

100 -Bugfixes to "git tag -n" that lacked much error checking.

131 +The transport programs ignored --no-progress and showed progress when

132 +sending their output to a terminal.

133

102 -* jk/prompt-fallback-to-tty (2012-02-03) 2 commits

103 - (merged to 'next' on 2012-02-06 at c0c995a)

104 - + prompt: fall back to terminal if askpass fails

105 - + prompt: clean up strbuf usage

134 +* jk/diff-highlight (2012-02-13) 5 commits

135 + - diff-highlight: document some non-optimal cases

136 + - diff-highlight: match multi-line hunks

137 + - diff-highlight: refactor to prepare for multi-line hunks

138 + - diff-highlight: don't highlight whole lines

139 + - diff-highlight: make perl strict and warnings fatal

140

107 -The code to ask for password did not fall back to the terminal input when

108 -GIT_ASKPASS is set but does not work (e.g. lack of X with GUI askpass

109 -helper).

141 +Updates diff-highlight (in contrib/).

142

111 -* jn/gitweb-search-utf-8 (2012-02-03) 1 commit

112 - (merged to 'next' on 2012-02-05 at 055e446)

113 - + gitweb: Allow UTF-8 encoded CGI query parameters and path_info

143 +* zj/decimal-width (2012-02-14) 1 commit

144 + (merged to 'next' on 2012-02-16 at 72805c4)

145 + + make lineno_width() from blame reusable for others

146 + (this branch is used by zj/diff-stat-dyncol.)

147

115 -Search box in "gitweb" did not accept non-ASCII characters correctly.

148 +Refactoring.

149

117 -* jn/merge-no-edit-fix (2012-02-09) 1 commit

118 - (merged to 'next' on 2012-02-10 at 014eec9)

119 - + merge: do not launch an editor on "--no-edit $tag"

150 +* zj/term-columns (2012-02-13) 1 commit

151 + (merged to 'next' on 2012-02-16 at fe70c88)

152 + + pager: find out the terminal width before spawning the pager

153 + (this branch is used by zj/diff-stat-dyncol.)

154

121 -In 1.7.9, "merge --no-edit $tag" incorrectly ignored --no-edit.

155 +Fixes "git -p cmd" for any subcommand that cares about the true terminal

156 +width.

157

123 -* mm/empty-loose-error-message (2012-02-06) 1 commit

124 - (merged to 'next' on 2012-02-07 at f119cac)

125 - + fsck: give accurate error message on empty loose object files

158 +* hv/submodule-recurse-push (2012-02-13) 3 commits

159 + - push: teach --recurse-submodules the on-demand option

160 + - Refactor submodule push check to use string list instead of integer

161 + - Teach revision walking machinery to walk multiple times sequencially

162

127 -Updates the error message emitted when we see an empty loose object.

163 +The bottom one was not clearly explained.

164

129 -* mp/make-cleanse-x-for-exe (2012-02-09) 1 commit

130 - (merged to 'next' on 2012-02-09 at 35cc89d)

131 - + Explicitly set X to avoid potential build breakage

165 +* zj/diff-stat-dyncol (2012-02-15) 6 commits

166 + . diff --stat: use less columns for change counts

167 + - (squash to the previous -- replace the last line of the log with the following)

168 + - diff --stat: use the full terminal width

169 + - (squash to the previous -- replace the log message with this)

170 + - diff --stat: tests for long filenames and big change counts

171 + - Merge branches zj/decimal-width and zj/term-columns

172 + (this branch uses zj/decimal-width and zj/term-columns.)

173

133 -The makefile allowed environment variable X seep into it result in

134 -command names suffixed with unnecessary strings.

174 +* jc/diff-stat-scaler (2012-02-14) 1 commit

175 + (merged to 'next' on 2012-02-16 at 404d336)

176 + + diff --stat: show bars of same length for paths with same amount of changes

177

136 -* nd/cache-tree-api-refactor (2012-02-07) 1 commit

137 - (merged to 'next' on 2012-02-08 at a9abbca)

138 - + cache-tree: update API to take abitrary flags

178 +The output from "git diff --stat" for two paths that have the same amount

179 +of changes showed graph bars of different length due to the way we handled

180 +rounding errors.

181

140 -Code cleanup.

182 +* jn/gitweb-unborn-head (2012-02-16) 1 commit

183 + - gitweb: Deal with HEAD pointing to unborn branch in "heads" view

184

142 -* nd/diffstat-gramnum (2012-02-03) 1 commit

143 - (merged to 'next' on 2012-02-05 at 7335ecc)

144 - + Use correct grammar in diffstat summary line

185 +"gitweb" compared non-existent value of HEAD with the names of commit

186 +objects at tips of branches, triggering runtime warnings.

187

146 -The commands in the "git diff" family and "git apply --stat" that count

147 -the number of files changed and the number of lines inserted/deleted have

148 -been updated to match the output from "diffstat". This also opens the

149 -door to i18n this line.

188 +* tr/perftest (2012-02-16) 3 commits

189 + . Add a performance test for git-grep

190 + . Introduce a performance testing framework

191 + . Move the user-facing test library to test-lib-functions.sh

192

151 -* nd/find-pack-entry-recent-cache-invalidation (2012-02-01) 2 commits

152 - (merged to 'next' on 2012-02-01 at e26aed0)

153 - + find_pack_entry(): do not keep packed_git pointer locally

154 - + sha1_file.c: move the core logic of find_pack_entry() into fill_pack_entry()

193 +When merged to 'pu' this seems to break quite a lot of tests. One way it

194 +does so is by removing the write_script helper, but there may be others.

195

156 -* nk/ctype-for-perf (2012-02-10) 2 commits

157 - (merged to 'next' on 2012-02-10 at b41c6bb)

158 - + ctype: implement islower/isupper macro

159 - + ctype.c only wants git-compat-util.h

196 +* jb/required-filter (2012-02-16) 1 commit

197 + - Add a setting to require a filter to be successful

198

161 -* tt/profile-build-fix (2012-02-09) 2 commits

162 - (merged to 'next' on 2012-02-09 at 1c183af)

163 - + Makefile: fix syntax for older make

164 - (merged to 'next' on 2012-02-07 at c8c5f3f)

165 - + Fix build problems related to profile-directed optimization

199 +A content filter used to be a way to make the recorded contents "more

200 +useful", but this defines a way to optionally mark a filter "required".

201

202 --------------------------------------------------

203 [Stalled]

@@ -212,50 +247,42 @@ people an easy target to shoot for, they may be encouraged to help

247 out. The plan is not working :-(.

248

249 * nd/columns (2012-02-08) 15 commits

215 - - column: Fix some compiler and sparse warnings

216 - - column: add a corner-case test to t3200

217 - - columns: minimum coding style fixes

218 - - tag: add --column

219 - - column: support piping stdout to external git-column process

220 - - status: add --column

221 - - branch: add --column

222 - - help: reuse print_columns() for help -a

223 - - column: add column.ui for default column output settings

224 - - column: support columns with different widths

225 - - column: add columnar layout

226 - - Stop starting pager recursively

227 - - Add git-column and column mode parsing

228 - - column: add API to print items in columns

229 - - Save terminal width before setting up pager

230 -

231 -The "show list of ..." mode of a handful of commands learn to produce

232 -column-oriented output.

233 -

234 -Expecting a reroll.

250 + . column: Fix some compiler and sparse warnings

251 + . column: add a corner-case test to t3200

252 + . columns: minimum coding style fixes

253 + . tag: add --column

254 + . column: support piping stdout to external git-column process

255 + . status: add --column

256 + . branch: add --column

257 + . help: reuse print_columns() for help -a

258 + . column: add column.ui for default column output settings

259 + . column: support columns with different widths

260 + . column: add columnar layout

261 + . Stop starting pager recursively

262 + . Add git-column and column mode parsing

263 + . column: add API to print items in columns

264 + . Save terminal width before setting up pager

265 +

266 +Expecting a reroll on top of zj/term-columns topic.

267

268 --------------------------------------------------

269 [Cooking]

270

239 -* jn/ancient-meld-support (2012-02-10) 1 commit

240 - (merged to 'next' on 2012-02-13 at 28aca31)

241 - + mergetools/meld: Use --help output to detect --output support

242 -

243 -More reliably tell if the given version of "meld" supports --output

244 -option.

245 -

246 -* jk/config-include (2012-02-06) 2 commits

247 - (merged to 'next' on 2012-02-13 at 307ddf6)

248 - + config: add include directive

271 +* jk/config-include (2012-02-16) 9 commits

272 + - config: add include directive

273 + - config: eliminate config_exclusive_filename

274 + - config: stop using config_exclusive_filename

275 + - config: provide a version of git_config with more options

276 + - config: teach git_config_rename_section a file argument

277 + - config: teach git_config_set_multivar_in_file a default path

278 + - config: copy the return value of prefix_filename

279 + - t1300: add missing &&-chaining

280 + docs: add a basic description of the config API

281

282 An assignment to the include.path pseudo-variable causes the named file

283 to be included in-place when Git looks up configuration variables.

284

254 -* jk/userdiff-config-simplify (2012-02-07) 1 commit

255 - (merged to 'next' on 2012-02-10 at e9854c1)

256 - + drop odd return value semantics from userdiff_config

257 -

258 -Code cleanup.

285 +Reverted the earlier round from 'next'.

286

287 * tg/tag-points-at (2012-02-13) 2 commits

288 (merged to 'next' on 2012-02-13 at a8f4046)

@@ -263,53 +290,17 @@ Code cleanup.

290 (merged to 'next' on 2012-02-10 at 4bff88f)

291 + tag: add --points-at list option

292

293 +Will merge to 'master'.

294 +

295 * jl/maint-submodule-relative (2012-02-09) 2 commits

296 - submodules: always use a relative path from gitdir to work tree

297 - submodules: always use a relative path to gitdir

298

299 The second one looked iffy.

300

272 -* ld/git-p4-expanded-keywords (2012-02-09) 2 commits

273 - - git-p4: initial demonstration of possible RCS keyword fixup

274 - - git-p4: add test case for RCS keywords

275 -

276 -Waiting for reviews and user reports.

277 -

278 -* jk/grep-binary-attribute (2012-02-02) 9 commits

279 - (merged to 'next' on 2012-02-05 at 9dffa7e)

280 - + grep: pre-load userdiff drivers when threaded

281 - + grep: load file data after checking binary-ness

282 - + grep: respect diff attributes for binary-ness

283 - + grep: cache userdiff_driver in grep_source

284 - + grep: drop grep_buffer's "name" parameter

285 - + convert git-grep to use grep_source interface

286 - + grep: refactor the concept of "grep source" into an object

287 - + grep: move sha1-reading mutex into low-level code

288 - + grep: make locking flag global

289 -

290 -Fixes a longstanding bug that there was no way to tell "git grep" that a

291 -path may look like text but it is not, which "git diff" can do using the

292 -attributes system. Now "git grep" honors the same "binary" (or "-diff")

293 -attribute.

294 -

295 -Will merge to 'master' after 1.7.9.1 settles.

296 -

297 -* jk/git-dir-lookup (2012-02-02) 1 commit

298 - (merged to 'next' on 2012-02-05 at 1856d74)

299 - + standardize and improve lookup rules for external local repos

300 -

301 -When you have both .../foo and .../foo.git, "git clone .../foo" did not

302 -favor the former but the latter.

303 -

304 -Will merge to 'master' after 1.7.9.1 settles.

305 -

306 -* nd/pack-objects-parseopt (2012-02-01) 3 commits

307 - (merged to 'next' on 2012-02-05 at d0dc25d)

308 - + pack-objects: convert to use parse_options()

309 - + pack-objects: remove bogus comment

310 - + pack-objects: do not accept "--index-version=version,"

311 -

312 -"pack-objects" learned use parse-options, losing custom command line

313 -parsing code.

301 +* ld/git-p4-expanded-keywords (2012-02-14) 1 commit

302 + (merged to 'next' on 2012-02-16 at a9004c5)

303 + + git-p4: add initial support for RCS keywords

304

315 -Will merge to 'master' after 1.7.9.1 settles.

305 +Teach git-p4 to unexpand $RCS$-like keywords that are embedded in

306 +tracked contents in order to reduce unnecessary merge conflicts.

What's cooking (2012/02 #06)