f913e9982d · matheusbsbs/matheus-bagliano

@@ -1,64 +1,167 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Jul 2012, #03; Wed, 11)

3 -X-master-at: 2b533592900ecebeb69e2dd1b70744433700ff2d

4 -X-next-at: 03fbcf6d885017d6d49b32c4b9a7f578ebd6d0de

2 +Subject: What's cooking in git.git (Jul 2012, #04; Fri, 13)

3 +X-master-at: 48c42ff66244f754cc02d9bcca0962c791c7d57e

4 +X-next-at: 534e6fe3169c23d847bc59311217dedfc6669bc1

5

6 -What's cooking in git.git (Jul 2012, #03; Wed, 11)

6 +What's cooking in git.git (Jul 2012, #04; Fri, 13)

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 -Many topics in flight are now in 'next' and all of them look more or

13 -less done (knock wood). Many fixes that are already in 'master' are

14 -now merged down to the 'maint' branch and 1.7.11.2 has been tagged.

12 +The sixth batch of topics are now in 'master'.

13

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

15 repositories listed at

16

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

18

19 +--------------------------------------------------

20 +[Graduated to "master"]

21 +

22 +* jc/refactor-diff-stdin (2012-06-28) 3 commits

23 + (merged to 'next' on 2012-07-09 at ef407ee)

24 + + diff-index.c: "git diff" has no need to read blob from the standard input

25 + + diff-index.c: unify handling of command line paths

26 + + diff-index.c: do not pretend paths are pathspecs

27 +

28 +Due to the way "git diff --no-index" is bolted onto by touching the

29 +low level code that is shared with the rest of the "git diff" code,

30 +even though it has to work in a very different way, any comparison

31 +that involves a file "-" at the root level incorrectly tried to read

32 +from the standard input. This cleans up the no-index codepath

33 +further to remove code that reads from the standard input from the

34 +core side, which is never necessary when git is running its usual

35 +diff operation.

36 +

37 +* jn/vcs-svn (2012-07-05) 12 commits

38 + (merged to 'next' on 2012-07-09 at 1d97a8f)

39 + + vcs-svn: allow 64-bit Prop-Content-Length

40 + + vcs-svn: suppress a signed/unsigned comparison warning

41 + + vcs-svn: suppress a signed/unsigned comparison warning

42 + + vcs-svn: suppress signed/unsigned comparison warnings

43 + + vcs-svn: use strstr instead of memmem

44 + + vcs-svn: use constcmp instead of prefixcmp

45 + + vcs-svn: simplify cleanup in apply_one_window

46 + + vcs-svn: avoid self-assignment in dummy initialization of pre_off

47 + + vcs-svn: drop no-op reset methods

48 + + vcs-svn: suppress -Wtype-limits warning

49 + + vcs-svn: allow import of > 4GiB files

50 + + vcs-svn: rename check_overflow and its arguments for clarity

51 +

52 +Reroll of db/vcs-svn.

53 +

54 +* mm/mediawiki-file-attachments (2012-07-04) 6 commits

55 + (merged to 'next' on 2012-07-09 at 4b85fa2)

56 + + git-remote-mediawiki: improve support for non-English Wikis

57 + (merged to 'next' on 2012-07-03 at 90f2f45)

58 + + git-remote-mediawiki: import "File:" attachments

59 + + git-remote-mediawiki: split get_mw_pages into smaller functions

60 + + git-remote-mediawiki: send "File:" attachments to a remote wiki

61 + + git-remote-mediawiki: don't "use encoding 'utf8';"

62 + + git-remote-mediawiki: don't compute the diff when getting commit message

63 + (this branch is used by mm/mediawiki-tests.)

64 +

65 +"mediawiki" remote helper (in contrib/) learned to handle file

66 +attachments.

67 +

68 +* mm/mediawiki-tests (2012-07-06) 12 commits

69 + (merged to 'next' on 2012-07-09 at 4d874e8)

70 + + git-remote-mediawiki: be more defensive when requests fail

71 + + git-remote-mediawiki: more efficient 'pull' in the best case

72 + + git-remote-mediawiki: extract revision-importing loop to a function

73 + + git-remote-mediawiki: refactor loop over revision ids

74 + + git-remote-mediawiki: change return type of get_mw_pages

75 + + git-remote-mediawiki (t9363): test 'File:' import and export

76 + + git-remote-mediawiki: support for uploading file in test environment

77 + + git-remote-mediawiki (t9362): test git-remote-mediawiki with UTF8 characters

78 + + git-remote-mediawiki (t9361): test git-remote-mediawiki pull and push

79 + + git-remote-mediawiki (t9360): test git-remote-mediawiki clone

80 + + git-remote-mediawiki: test environment of git-remote-mediawiki

81 + + git-remote-mediawiki: scripts to install, delete and clear a MediaWiki

82 + (this branch uses mm/mediawiki-file-attachments.)

83 +

84 +* mz/rebase-no-mbox (2012-06-26) 4 commits

85 + (merged to 'next' on 2012-07-03 at 5bf5c12)

86 + + am: don't call mailinfo if $rebasing

87 + + am --rebasing: get patch body from commit, not from mailbox

88 + + rebase --root: print usage on too many args

89 + + rebase: don't source git-sh-setup twice

90 +

91 +Teach "am --rebasing" codepath to grab authorship, log message and

92 +the patch text directly out of existing commits. This will help

93 +rebasing commits that have confusing "diff" output in their log

94 +messages.

95 +

96 +* tb/sanitize-decomposed-utf-8-pathname (2012-07-08) 1 commit

97 + (merged to 'next' on 2012-07-09 at 61b12c2)

98 + + git on Mac OS and precomposed unicode

99 +

100 +Teaches git to normalize pathnames read from readdir(3) and all

101 +arguments from the command line into precomposed UTF-8 (assuming

102 +that they come as decomposed UTF-8) to work around issues on Mac OS.

103 +

104 +I think there still are other places that need conversion

105 +(e.g. paths that are read from stdin for some commands), but this

106 +should be a good first step in the right direction.

107 +

108 +* tg/ce-namelen (2012-07-08) 1 commit

109 + (merged to 'next' on 2012-07-10 at 87755d8)

110 + + Replace strlen() with ce_namelen()

111 +

112 +Trivially correct clean-up and micro optimization.

113 +

114 +* tr/maint-show-walk (2012-06-19) 2 commits

115 + (merged to 'next' on 2012-07-09 at c8e0e06)

116 + + show: fix "range implies walking"

117 + + Demonstrate git-show is broken with ranges

118 +

119 +Fixes "git show"'s auto-walking behaviour, and make it behave just

120 +like "git log" does when it walks.

121 +

122 +Note that this is different from Thomas's patch.

123 +

124 --------------------------------------------------

125 [New Topics]

126

24 -* jc/maint-filter-branch-epoch-date (2012-07-09) 1 commit

25 - (merged to 'next' on 2012-07-10 at f9774ca)

26 - + filter-branch: do not forget the '@' prefix to force git-timestamp

127 +* as/t4012-style-updates (2012-07-12) 7 commits

128 + - t4012: use 'printf' instead of 'dd' to generate a binary file

129 + - t4012: Re-indent test snippets

130 + - t4012: Make --shortstat test more robust

131 + - t4012: Break up pipe into serial redirections

132 + - t4012: Actually quote the sed script

133 + - t4012: Unquote git command fragment in test title

134 + - t4012: modernize style for quoting

135

28 -In 1.7.9 era, we taught "git rebase" about the raw timestamp format

29 -but we did not teach the same trick to "filter-branch", which rolled

30 -a similar logic on its own.

136 +Should I wait for a reroll???

137

32 -* jk/maint-commit-amend-only-no-paths (2012-07-10) 1 commit

33 - (merged to 'next' on 2012-07-10 at 1c650c2)

34 - + commit: fix "--amend --only" with no pathspec

138 +* jl/maint-1.7.10-recurse-submodules-with-symlink (2012-07-12) 1 commit

139 + - submodules: don't stumble over symbolic links when cloning recursively

140

36 -"git commit --amend --only --" was meant to allow "Clever" people to

37 -rewrite the commit message without making any change even when they

38 -have already changes for the next commit added to their index, but

39 -it never worked as advertised since it was introduced in 1.3.0 era.

141 +When "git submodule add" clones a submodule repository, it can get

142 +confused where to store the resulting submodule repository in the

143 +superproject's .git/ directory when there is a symbolic link in the

144 +path to the current directory.

145

41 -* jk/index-pack-streaming-fix (2012-07-10) 1 commit

42 - - index-pack: loop while inflating objects in unpack_data

146 +* mm/config-xdg (2012-07-12) 2 commits

147 + - fixup! config: fix several access(NULL) calls

148 + - config: fix several access(NULL) calls

149

44 -This needs to go to 'master' soonish.

150 +Either we do the stupid literal conversion (shown in fixup!), or the

151 +reason why we special case missing HOME needs to be better explained.

152

46 -* mb/remote-default-nn-origin (2012-07-11) 6 commits

47 - - Teach get_default_remote to respect remote.default.

48 - - Test that plain "git fetch" uses remote.default when on a detached HEAD.

49 - - Teach clone to set remote.default.

50 - - Teach "git remote" about remote.default.

51 - - Teach remote.c about the remote.default configuration setting.

52 - - Rename remote.c's default_remote_name static variables.

153 +* jk/revision-walk-stop-at-max-count (2012-07-13) 1 commit

154 + - revision: avoid work after --max-count is reached

155

54 -* tg/ce-namelen-field (2012-07-11) 2 commits

55 - - Strip namelen out of ce_flags into a ce_namelen field

56 - - Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-field

57 - (this branch uses tg/maint-cache-name-compare.)

156 +"git log -n 1 -- rarely-touched-path" was spending unnecessary

157 +cycles after showing the first change to find the next one, only to

158 +discard it.

159

59 -* tg/maint-cache-name-compare (2012-07-11) 1 commit

60 - - cache_name_compare(): do not truncate while comparing paths

61 - (this branch is used by tg/ce-namelen-field.)

160 +* pg/maint-1.7.9-am-where-is-patch (2012-07-13) 1 commit

161 + - am: indicate where a failed patch is to be found

162 +

163 +When "git am" failed, old timers knew to check .git/rebase-apply/patch

164 +to see what went wrong, but we never told the users about it.

165

166 --------------------------------------------------

167 [Stalled]

@@ -105,6 +208,64 @@ not working :-(.

208 --------------------------------------------------

209 [Cooking]

210

211 +* jc/maint-filter-branch-epoch-date (2012-07-12) 3 commits

212 + (merged to 'next' on 2012-07-13 at d144342)

213 + + t7003: add test to filter a branch with a commit at epoch

214 + + date.c: Fix off by one error in object-header date parsing

215 + (merged to 'next' on 2012-07-10 at f9774ca)

216 + + filter-branch: do not forget the '@' prefix to force git-timestamp

217 +

218 +In 1.7.9 era, we taught "git rebase" about the raw timestamp format

219 +but we did not teach the same trick to "filter-branch", which rolled

220 +a similar logic on its own.

221 +

222 +* jk/maint-commit-amend-only-no-paths (2012-07-10) 1 commit

223 + (merged to 'next' on 2012-07-10 at 1c650c2)

224 + + commit: fix "--amend --only" with no pathspec

225 +

226 +"git commit --amend --only --" was meant to allow "Clever" people to

227 +rewrite the commit message without making any change even when they

228 +have already changes for the next commit added to their index, but

229 +it never worked as advertised since it was introduced in 1.3.0 era.

230 +

231 +* jk/index-pack-streaming-fix (2012-07-10) 1 commit

232 + - index-pack: loop while inflating objects in unpack_data

233 +

234 +The streaming index-pack introduced in 1.7.11 had a data corruption

235 +bug, and this should fix it.

236 +

237 +Will merge to 'next'.

238 +

239 +* mb/remote-default-nn-origin (2012-07-11) 6 commits

240 + - Teach get_default_remote to respect remote.default.

241 + - Test that plain "git fetch" uses remote.default when on a detached HEAD.

242 + - Teach clone to set remote.default.

243 + - Teach "git remote" about remote.default.

244 + - Teach remote.c about the remote.default configuration setting.

245 + - Rename remote.c's default_remote_name static variables.

246 +

247 +When the user does not specify what remote to interact with, we

248 +often attempt to use 'origin'. This can now be customized via a

249 +configuration variable.

250 +

251 +* tg/ce-namelen-field (2012-07-11) 2 commits

252 + - Strip namelen out of ce_flags into a ce_namelen field

253 + - Merge branch 'tg/maint-cache-name-compare' into tg/ce-namelen-field

254 + (this branch uses tg/maint-cache-name-compare.)

255 +

256 +Split lower bits of ce_flags field and creates a new ce_namelen

257 +field in the in-core index structure.

258 +

259 +* tg/maint-cache-name-compare (2012-07-11) 1 commit

260 + - cache_name_compare(): do not truncate while comparing paths

261 + (this branch is used by tg/ce-namelen-field.)

262 +

263 +Even though the index can record pathnames longer than 1<<12 bytes,

264 +in some places we were not comparing them in full, potentially

265 +replacing index entries instead of adding.

266 +

267 +Will merge to 'next', and then later down to older maintenance releases.

268 +

269 * jc/apply-3way (2012-07-09) 19 commits

270 (merged to 'next' on 2012-07-10 at fb5c872)

271 + apply: tests for the --3way option

@@ -134,18 +295,20 @@ when a patch does not exactly apply to the version you have.

295 - rm: remove submodules from the index and the .gitmodules file

296 - rm: don't fail when removing populated submodules

297

298 +Expecting a reroll.

299 +

300 * mh/maint-revisions-doc (2012-07-05) 2 commits

301 - Document rev^! and rev^@ as revision specifiers

302 - Make <refname> documentation more consistent.

303

141 -The tip one will be rerolled.

304 +Expecting a reroll of the tip one.

305

306 * nk/maint-gitweb-log-by-lines (2012-07-05) 3 commits

307 - gitweb: Add support to Link: tag

308 - gitweb: Handle other types of tag in git_print_log

309 - gitweb: Cleanup git_print_log()

310

148 -Is the use of esc_html() in the tip one correct?

311 +Needs to be eyeballed for the correctness of the esc_html() in the tip one.

312

313 * pw/git-p4-jobs (2012-07-05) 3 commits

314 (merged to 'next' on 2012-07-10 at c6ef8f9)

@@ -156,11 +319,11 @@ Is the use of esc_html() in the tip one correct?

319 Teach "git p4" to notice "Jobs:" in the log message and relay it to

320 Perforce to trigger its "jobs" support.

321

159 -* pw/git-p4-move (2012-07-05) 2 commits

322 +* pw/git-p4-move (2012-07-12) 2 commits

323 - git p4: add support for 'p4 move' in P4Submit

324 - git p4: refactor diffOpts calculation

325

163 -Will be rerolled.

326 +Will merge to 'next'.

327

328 * ar/clone-honor-umask-at-top (2012-07-09) 3 commits

329 (merged to 'next' on 2012-07-10 at 680bc22)

@@ -172,57 +335,12 @@ A handful of files and directories we create had tighter than

335 necessary permission bits when the user wanted to have group

336 writability (e.g. by setting "umask 002").

337

175 -* jn/vcs-svn (2012-07-05) 12 commits

176 - (merged to 'next' on 2012-07-09 at 1d97a8f)

177 - + vcs-svn: allow 64-bit Prop-Content-Length

178 - + vcs-svn: suppress a signed/unsigned comparison warning

179 - + vcs-svn: suppress a signed/unsigned comparison warning

180 - + vcs-svn: suppress signed/unsigned comparison warnings

181 - + vcs-svn: use strstr instead of memmem

182 - + vcs-svn: use constcmp instead of prefixcmp

183 - + vcs-svn: simplify cleanup in apply_one_window

184 - + vcs-svn: avoid self-assignment in dummy initialization of pre_off

185 - + vcs-svn: drop no-op reset methods

186 - + vcs-svn: suppress -Wtype-limits warning

187 - + vcs-svn: allow import of > 4GiB files

188 - + vcs-svn: rename check_overflow and its arguments for clarity

189 -

190 -Reroll of db/vcs-svn.

191 -

192 -Will merge to 'master'.

193 -

194 -* mm/mediawiki-tests (2012-07-06) 12 commits

195 - (merged to 'next' on 2012-07-09 at 4d874e8)

196 - + git-remote-mediawiki: be more defensive when requests fail

197 - + git-remote-mediawiki: more efficient 'pull' in the best case

198 - + git-remote-mediawiki: extract revision-importing loop to a function

199 - + git-remote-mediawiki: refactor loop over revision ids

200 - + git-remote-mediawiki: change return type of get_mw_pages

201 - + git-remote-mediawiki (t9363): test 'File:' import and export

202 - + git-remote-mediawiki: support for uploading file in test environment

203 - + git-remote-mediawiki (t9362): test git-remote-mediawiki with UTF8 characters

204 - + git-remote-mediawiki (t9361): test git-remote-mediawiki pull and push

205 - + git-remote-mediawiki (t9360): test git-remote-mediawiki clone

206 - + git-remote-mediawiki: test environment of git-remote-mediawiki

207 - + git-remote-mediawiki: scripts to install, delete and clear a MediaWiki

208 - (this branch uses mm/mediawiki-file-attachments.)

209 -

210 -Will merge to 'master'.

211 -

338 * ph/stash-rerere (2012-07-08) 2 commits

339 - stash: invoke rerere in case of conflict

340 - test: git-stash conflict sets up rerere

341

342 Will be rerolled but is going in the right direction.

343

218 -* tg/ce-namelen (2012-07-08) 1 commit

219 - (merged to 'next' on 2012-07-10 at 87755d8)

220 - + Replace strlen() with ce_namelen()

221 -

222 -Trivially correct clean-up and micro optimization.

223 -

224 -Will merge to 'master'.

225 -

344 * jn/makefile-cleanup (2012-07-09) 14 commits

345 (merged to 'next' on 2012-07-10 at f55e6a1)

346 + Makefile: document ground rules for target-specific dependencies

@@ -257,20 +375,6 @@ The error message from "git push $there :bogo" mentioned we tried

375 and failed to guess what ref is being deleted based on the LHS of

376 the refspec, which we don't.

377

260 -* tb/sanitize-decomposed-utf-8-pathname (2012-07-08) 1 commit

261 - (merged to 'next' on 2012-07-09 at 61b12c2)

262 - + git on Mac OS and precomposed unicode

263 -

264 -Teaches git to normalize pathnames read from readdir(3) and all

265 -arguments from the command line into precomposed UTF-8 (assuming

266 -that they come as decomposed UTF-8) to work around issues on Mac OS.

267 -

268 -I think there still are other places that need conversion

269 -(e.g. paths that are read from stdin for some commands), but this

270 -should be a good first step in the right direction.

271 -

272 -Will merge to 'master'.

273 -

378 * cw/rebase-i-root (2012-07-05) 3 commits

379 (merged to 'next' on 2012-07-05 at aeb4c56)

380 + t3404: make test 57 work with dash and others

@@ -281,53 +385,6 @@ Will merge to 'master'.

385 "git rebase [-i] --root $tip" can now be used to rewrite all the

386 history down to the root.

387

284 -* mm/mediawiki-file-attachments (2012-07-04) 6 commits

285 - (merged to 'next' on 2012-07-09 at 4b85fa2)

286 - + git-remote-mediawiki: improve support for non-English Wikis

287 - (merged to 'next' on 2012-07-03 at 90f2f45)

288 - + git-remote-mediawiki: import "File:" attachments

289 - + git-remote-mediawiki: split get_mw_pages into smaller functions

290 - + git-remote-mediawiki: send "File:" attachments to a remote wiki

291 - + git-remote-mediawiki: don't "use encoding 'utf8';"

292 - + git-remote-mediawiki: don't compute the diff when getting commit message

293 - (this branch is used by mm/mediawiki-tests.)

294 -

295 -"mediawiki" remote helper (in contrib/) learned to handle file

296 -attachments.

297 -

298 -Will merge to 'master'.

299 -

300 -* mz/rebase-no-mbox (2012-06-26) 4 commits

301 - (merged to 'next' on 2012-07-03 at 5bf5c12)

302 - + am: don't call mailinfo if $rebasing

303 - + am --rebasing: get patch body from commit, not from mailbox

304 - + rebase --root: print usage on too many args

305 - + rebase: don't source git-sh-setup twice

306 -

307 -Teach "am --rebasing" codepath to grab authorship, log message and

308 -the patch text directly out of existing commits. This will help

309 -rebasing commits that have confusing "diff" output in their log

310 -messages.

311 -

312 -Will merge to 'master'.

313 -

314 -* jc/refactor-diff-stdin (2012-06-28) 3 commits

315 - (merged to 'next' on 2012-07-09 at ef407ee)

316 - + diff-index.c: "git diff" has no need to read blob from the standard input

317 - + diff-index.c: unify handling of command line paths

318 - + diff-index.c: do not pretend paths are pathspecs

319 -

320 -Due to the way "git diff --no-index" is bolted onto by touching the

321 -low level code that is shared with the rest of the "git diff" code,

322 -even though it has to work in a very different way, any comparison

323 -that involves a file "-" at the root level incorrectly tried to read

324 -from the standard input. This cleans up the no-index codepath

325 -further to remove code that reads from the standard input from the

326 -core side, which is never necessary when git is running its usual

327 -diff operation.

328 -

329 -Will merge to 'master', and later down to older maintenance releases.

330 -

388 * lt/commit-tree-guess-utf-8 (2012-06-28) 1 commit

389 - commit/commit-tree: correct latin1 to utf-8

390

@@ -350,7 +407,11 @@ one of its early operations.

407 Needs to be eyeballed by people who run tests with exotic options

408 like valgrind, --root=/dev/shm/somewhere, etc.

409

353 -* jc/sha1-name-more (2012-07-09) 25 commits

410 +* jc/sha1-name-more (2012-07-13) 27 commits

411 + (merged to 'next' on 2012-07-13 at 534e6fe)

412 + + t1512: match the "other" object names

413 + (merged to 'next' on 2012-07-11 at d30ef51)

414 + + t1512: ignore whitespaces in wc -l output

415 (merged to 'next' on 2012-07-10 at 669dd92)

416 + rev-parse --disambiguate=<prefix>

417 + rev-parse: A and B in "rev-parse A..B" refer to committish

@@ -383,18 +444,6 @@ is always a commit object, "A" in "git log A" must be a committish,

444 and "A" and "B" in "git log A...B" both must be committish, etc., to

445 prolong the lifetime of abbreviated object names.

446

386 -* tr/maint-show-walk (2012-06-19) 2 commits

387 - (merged to 'next' on 2012-07-09 at c8e0e06)

388 - + show: fix "range implies walking"

389 - + Demonstrate git-show is broken with ranges

390 -

391 -Fixes "git show"'s auto-walking behaviour, and make it behave just

392 -like "git log" does when it walks.

393 -

394 -Note that this is different from Thomas's patch.

395 -

396 -Will merge to 'master'.

397 -

447 * jk/no-more-pre-exec-callback (2012-06-05) 1 commit

448 - pager: drop "wait for output to run less" hack

449

What's cooking (2012/07 #04)