c3aa0e4c6b · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Feb 2012, #04; Fri, 10)

3 -X-master-at: b6b3b6a01f357922ccd14f2615accc9bd39fc194

4 -X-next-at: b41c6bb8e2f080306ede9023919c9e703e625c79

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

3 +X-master-at: 6f5e880c68099b185e60b2492c75e506e16d8292

4 +X-next-at: adb73538176221d26b30b46087711875caebc24b

5

6 -What's cooking in git.git (Feb 2012, #04; Fri, 10)

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

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

8

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

@@ -21,63 +21,148 @@ repositories listed at

21 --------------------------------------------------

22 [New Topics]

23

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

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

26 - + ctype: implement islower/isupper macro

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

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

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

26 + + gitweb: Harden and improve $project_filter page title

27

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

30 - - mergetools/meld: Use --help output to detect --output support

28 +An update to the new feature to "gitweb" to show list of projects for

29 +intermediate levels in directory hierarchies, already slated for 1.7.10.

30 +

31 +* dp/i18n-libcharset (2012-02-13) 1 commit

32 + (merged to 'next' on 2012-02-13 at 528de77)

33 + + Makefile: introduce CHARSET_LIB to link with -lcharset

34 +

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

36 +

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

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

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

40 +

41 +For 1.7.10 where "git merge" by default spawns the editor when it can

42 +automatically commit to record the resulting merge.

43 +

44 +* mh/war-on-extra-refs (2012-02-12) 7 commits

45 + (merged to 'next' on 2012-02-13 at adb7353)

46 + + refs: remove the extra_refs API

47 + + clone: do not add alternate references to extra_refs

48 + + everything_local(): mark alternate refs as complete

49 + + fetch-pack.c: inline insert_alternate_refs()

50 + + fetch-pack.c: rename some parameters from "path" to "refname"

51 + + clone.c: move more code into the "if (refs)" conditional

52 + + t5700: document a failure of alternates to affect fetch

53 +

54 +Internal API clean-up that is very cleanly done.

55

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

57 [Graduated to "master"]

58

35 -* jc/branch-desc-typoavoidance (2012-02-05) 2 commits

36 - (merged to 'next' on 2012-02-06 at 9fb0568)

37 - + branch --edit-description: protect against mistyped branch name

38 - + tests: add write_script helper function

39 - (this branch is tangled with jk/tests-write-script.)

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

41 -Typo in "git branch --edit-description my-tpoic" was not diagnosed.

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

64

43 -* jc/merge-ff-only-stronger-than-signed-merge (2012-02-05) 1 commit

44 - (merged to 'next' on 2012-02-06 at 0fabf12)

45 - + merge: do not create a signed tag merge under --ff-only option

46 - (this branch is used by jn/merge-no-edit-fix.)

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

70

48 -"git merge --ff-only $tag" failed because it cannot record the required

49 -mergetag without creating a merge, but this is so common operation for

50 -branch that is used _only_ to follow the upstream, so it is allowed to

51 -fast-forward without recording the mergetag.

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

72

53 -* jc/parse-date-raw (2012-02-03) 2 commits

54 - (merged to 'next' on 2012-02-07 at 486ae6e)

55 - + parse_date(): '@' prefix forces git-timestamp

56 - + parse_date(): allow ancient git-timestamp

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

76

58 -"rebase" and "commit --amend" failed to work on commits with ancient

59 -timestamps near year 1970.

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

78

61 -* jk/tests-write-script (2012-02-03) 2 commits

62 - (merged to 'next' on 2012-02-05 at 4264ffa)

63 - + t0300: use write_script helper

64 - + tests: add write_script helper function

65 - (this branch is tangled with jc/branch-desc-typoavoidance.)

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

82

67 -* jn/rpm-spec (2012-02-03) 1 commit

68 - (merged to 'next' on 2012-02-05 at dba940b)

69 - + git.spec: Workaround localized messages not put in any RPM

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

84 +complicated by bad suggestions I made earlier.

85 +

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

89 +

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.

93 +

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

99

71 -Fix breakage in v1.7.9 Makefile; rpmbuild notices an unpackaged but

72 -installed *.mo file and fails.

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

101

74 -* js/add-e-submodule-fix (2012-02-07) 1 commit

75 - (merged to 'next' on 2012-02-08 at c8e2d28)

76 - + add -e: do not show difference in a submodule that is merely dirty

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

106 +

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

110

78 -"add -e" learned not to show a diff for an otherwise unmodified submodule

79 -that only has uncommitted local changes in the patch prepared by for the

80 -user to edit.

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

114 +

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

116 +

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"

120 +

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

122 +

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

126 +

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

128 +

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

132 +

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

134 +command names suffixed with unnecessary strings.

135 +

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

139 +

140 +Code cleanup.

141 +

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

145 +

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.

150 +

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

155 +

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

160 +

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

166

167 --------------------------------------------------

168 [Stalled]

@@ -151,50 +236,30 @@ Expecting a reroll.

236 --------------------------------------------------

237 [Cooking]

238

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

155 - - config: add include directive

156 - - docs: add a basic description of the config API

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

248 + + config: add include directive

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

250

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

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

253

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

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

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

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

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

166 -

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

168 -Will merge to 'masster'.

169 -

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

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

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

173 -

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

175 -Will merge to 'masster'.

176 -

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

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

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

180 -

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

182 -complicated by bad suggestions I made earlier.

183 -Will merge to 'masster'.

184 -

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.

259

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

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

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

194 -

195 -Code cleanup.

196 -

197 -* tg/tag-points-at (2012-02-08) 1 commit

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

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

262 + + builtin/tag.c: Fix a sparse warning

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

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

265

@@ -204,62 +269,12 @@ Code cleanup.

269

270 The second one looked iffy.

271

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

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

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

210 -

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

212 -

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

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

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

221 - + Explicitly set X to avoid potential build breakage

222 -

223 -Will merge to 'master'.

224 -

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

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

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

228 -

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

230 -Will merge to 'master'.

231 -

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

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

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

235 -

236 -I was fairly negative on this one, but Michael Haggerty and Peff convinced

237 -me that selling this as "'checkout -b' that lack the <start point> is

238 -about creating a new branch from my current state" is perfectly fine.

239 -

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

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

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

243 -

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

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

246 -the end of email addresses.

247 -

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

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

250 - + Makefile: fix syntax for older make

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

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

253 -

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

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

256 - + Use correct grammar in diffstat summary line

257 -

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

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

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

261 -door to i18n this line.

262 -

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

@@ -277,6 +292,8 @@ 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

@@ -284,33 +301,7 @@ attribute.

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

302 favor the former but the latter.

303

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

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

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

290 - + prompt: clean up strbuf usage

291 -

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

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

294 -helper).

295 -

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

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

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

299 -

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

301 -

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

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

304 - + completion: simplify __gitcomp and __gitcomp_nl implementations

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

306 - + completion: work around zsh option propagation bug

307 -

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

309 -

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

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

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

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

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)

@@ -320,3 +311,5 @@ Fix git subcommand completion for zsh (in contrib/completion).

311

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

313 parsing code.

314 +

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

What's cooking (2012/02 #05)