81fb448557 · matheusbsbs/matheus-bagliano

@@ -1,18 +1,21 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Apr 2012, #11; Sun, 29)

3 -X-master-at: 10d4332e007132a38dc61f03c760d355da5cd550

4 -X-next-at: ed71f9c8badf2d237c862b15ea4145e0ecd96004

2 +Subject: What's cooking in git.git (May 2012, #01; Wed, 2)

3 +X-master-at: 34875f4a53b9e495622553a671776f66dc37eb2b

4 +X-next-at: 54d16fbcc9122b1e712cc718d11dda4a9c125ec6

5

6 -What's cooking in git.git (Apr 2012, #11; Sun, 29)

6 +What's cooking in git.git (May 2012, #01; Wed, 2)

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 -The sixth and seventh batch of topics in this cycle is now in 'master'. I

13 -also merged accumulated fixes that have been in 'master' since v1.7.10 to

14 -'maint', so that we can issue the first maintenance release sometime next

15 -week.

12 +The eighth batch of topics in this cycle is now in 'master', the topics in

13 +'next' all look ready, and we do not have many topics left in 'pu'. The

14 +cycle is going well ;-)

15 +

16 +Except for folks with libsvn-perl 1.6.x where x is greater than 9; we know

17 +how the fix should look like, and we will have it in tomorrow's integration

18 +round.

19

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

21 repositories listed at

@@ -20,128 +23,267 @@ repositories listed at

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

24

25 --------------------------------------------------

23 -[Graduated to "master"]

26 +[New Topics]

27 +

28 +* jk/maint-tformat-with-z (2012-05-01) 2 commits

29 + (merged to 'next' on 2012-05-02 at a0f8af7)

30 + + log-tree: the previous one is still not quite right

31 + + log-tree: use custom line terminator in line termination mode

32 +

33 +"log -z --pretty=tformat:..." does not terminate each record with NUL

34 +and this is a beginning of an attempt to fix it. It still is not right

35 +but the patch does not make externally observable behaviour worse.

36 +

37 +Will merge to 'master'.

38 +

39 +* nd/stream-to-archive (2012-04-30) 9 commits

40 + - archive-zip: streaming for deflated files

41 + - archive-zip: streaming for stored files

42 + - archive-zip: factor out helpers for writing sizes and CRC

43 + - archive-zip: remove uncompressed_size

44 + - streaming: void pointer instead of char pointer

45 + - archive-tar: stream large blobs to tar file

46 + - archive: delegate blob reading to backend

47 + - archive-tar: unindent write_tar_entry by one level

48 + - archive-tar: turn write_tar_entry into blob-writing only

49 +

50 +Stream large blobs directly out to archive files without slurping

51 +everything in memory first. The streaming version of "tar" may need

52 +further fixing.

53

25 -* cb/cherry-pick-rev-path-confusion (2012-04-15) 1 commit

26 - (merged to 'next' on 2012-04-23 at f872ba5)

27 - + cherry-pick: do not expect file arguments

28 -

29 -The command line parser choked "git cherry-pick $name" when $name can be

30 -both revision name and a pathname, even though $name can never be a path

31 -in the context of the command.

32 -

33 -The issue the patch addresses is real, but the way it is implemented felt

34 -unnecessarily invasive a bit. It may be cleaner for this caller to add

35 -the "--" to the end of the argv_array it passes to setup_revisions().

36 -

37 -* cb/http-multi-curl-auth (2012-04-14) 4 commits

38 - (merged to 'next' on 2012-04-23 at b0259be)

39 - + http: use newer curl options for setting credentials

40 - + http: clean up leak in init_curl_http_auth

41 - + fix http auth with multiple curl handles

42 - + http auth fails with multiple curl handles

43 -

44 -Fixes http authentication breakage when we keep multiple HTTP requests in

45 -flight using curl-multi.

46 -

47 -* cb/maint-report-mount-point-correctly-in-setup (2012-04-15) 1 commit

48 - (merged to 'next' on 2012-04-23 at 9e0c8b4)

49 - + properly keep track of current working directory

50 -

51 -The filesystem boundary was not correctly reported when .git directory

52 -discovery stopped at a mount point.

53 -

54 -* jc/merge-reduce-parents-early (2012-04-18) 5 commits

55 - (merged to 'next' on 2012-04-23 at 16e7e53)

56 - + fmt-merge-msg: discard needless merge parents

57 - + builtin/merge.c: reduce parents early

58 - + builtin/merge.c: collect other parents early

59 - + builtin/merge.c: remove "remoteheads" global variable

60 - + merge tests: octopus with redundant parents

61 -

62 -* jk/repack-no-explode-objects-from-old-pack (2012-04-18) 4 commits

63 - (merged to 'next' on 2012-04-20 at 4eb2534)

64 - + gc: use argv-array for sub-commands

65 - + argv-array: add a new "pushl" method

66 - + argv-array: refactor empty_argv initialization

67 - (merged to 'next' on 2012-04-15 at 7586e50)

68 - + gc: do not explode objects which will be immediately pruned

69 -

70 -* js/daemon-test-race-fix (2012-04-27) 1 commit

71 - (merged to 'next' on 2012-04-27 at 6edb57f)

72 - + t5570: fix forwarding of git-daemon messages via cat

73 -

74 -The shell construct to launch git-daemon and wait for it to start

75 -serving during the test was faulty, and this fixes it.

76 -

77 -Replaced cb/daemon-test-race-fix topic with this, as this addresses

78 -the real cause of the issue.

79 -

80 -* js/fast-import-test-9300 (2012-04-20) 1 commit

81 - (merged to 'next' on 2012-04-23 at a9bd236)

82 - + t9300-fast-import: avoid 'exit' in test_expect_success snippets

83 -

84 -* kk/gitweb-omit-expensive (2012-04-26) 2 commits

85 - (merged to 'next' on 2012-04-27 at b057127)

86 - + gitweb: Option to not display information about owner

87 - + gitweb: Option to omit column with time of the last change

88 - (this branch uses kk/maint-gitweb-missing-owner.)

89 -

90 -"gitweb" learned to optionally omit output of fields that are expensive

91 -to generate.

92 -

93 -* kk/maint-gitweb-missing-owner (2012-04-25) 1 commit

94 - (merged to 'next' on 2012-04-27 at e526304)

95 - + gitweb: Don't set owner if got empty value from projects.list

96 - (this branch is used by kk/gitweb-omit-expensive.)

97 -

98 -* mm/include-userpath (2012-04-25) 2 commits

99 - (merged to 'next' on 2012-04-26 at c68e261)

100 - + fixup! config: expand tildes in include.path variable

101 - + config: expand tildes in include.path variable

102 -

103 -The new "include.path" directive in the configuration files learned

104 -to understand "~/path" and "~user/path".

105 -

106 -* pw/t5800-import-race-fix (2012-04-24) 1 commit

107 - (merged to 'next' on 2012-04-24 at e97bb42)

108 - + git-remote-testgit: fix race when spawning fast-import

109 -

110 -Longstanding bug in a test scaffolding that occasionally made t5800

111 -hang was fixed.

112 -

113 -* rs/commit-list-append (2012-04-25) 3 commits

114 - (merged to 'next' on 2012-04-26 at 2ba48b3)

115 - + commit: remove commit_list_reverse()

116 - + revision: append to list instead of insert and reverse

117 - + sequencer: export commit_list_append()

118 -

119 -* rt/cherry-revert-conflict-summary (2012-04-19) 1 commit

120 - (merged to 'next' on 2012-04-23 at e7766c2)

121 - + sequencer: remove additional blank line

122 -

123 -In the older days, the header "Conflicts:" in "cherry-pick" and

124 -"merge" was separated by a blank line from the list of paths that

125 -follow for readability, but when "merge" was rewritten in C, we lost

126 -it by mistake. Remove the newline from "cherry-pick" to make them

127 -match again.

54 +Expecting another reroll; the second version already had review exchanges

55 +so I didn't pick it up.

56 +

57 +* jk/maint-push-progress (2012-05-01) 3 commits

58 + (merged to 'next' on 2012-05-01 at 2286130)

59 + + t5541: test more combinations of --progress

60 + + teach send-pack about --[no-]progress

61 + + send-pack: show progress when isatty(2)

62 +

63 +"git push" over smart-http lost progress output and this resurrects it.

64 +

65 +Will merge to 'master'.

66 +

67 +* zj/diff-empty-chmod (2012-05-02) 5 commits

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

69 + + t4006: Windows do not have /dev/zero

70 + (merged to 'next' on 2012-05-01 at 5a92787)

71 + + diff --stat: do not run diff on indentical files

72 + + diff --stat: report mode-only changes for binary files like text files

73 + + tests: check --[short]stat output after chmod

74 + + test: modernize style of t4006

75 +

76 +"git diff --stat" used to fully count a binary file with modified

77 +execution bits whose contents is unmodified, which was not right.

78 +

79 +Will merge to 'master'.

80

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

130 -[New Topics]

82 +[Graduated to "master"]

83 +

84 +* ab/i18n (2012-04-30) 3 commits

85 + (merged to 'next' on 2012-04-30 at 5e7620d)

86 + + git-commit: remove lego in i18n messages

87 + + git-commit: remove lego in i18n messages

88 + + git-branch: remove lego in i18n messages

89 +

90 +Fixes some constructs that build messages meant for i18n by concatenating

91 +pieces of strings.

92 +

93 +* jc/index-v4 (2012-04-27) 12 commits

94 + (merged to 'next' on 2012-04-29 at ed71f9c)

95 + + index-v4: document the entry format

96 + + unpack-trees: preserve the index file version of original

97 + (merged to 'next' on 2012-04-19 at 5e4b029)

98 + + update-index: upgrade/downgrade on-disk index version

99 + + read-cache.c: write prefix-compressed names in the index

100 + + read-cache.c: read prefix-compressed names in index on-disk version v4

101 + + read-cache.c: move code to copy incore to ondisk cache to a helper function

102 + + read-cache.c: move code to copy ondisk to incore cache to a helper function

103 + + read-cache.c: report the header version we do not understand

104 + + read-cache.c: make create_from_disk() report number of bytes it consumed

105 + + read-cache.c: allow unaligned mapping of the index file

106 + + cache.h: hide on-disk index details

107 + + varint: make it available outside the context of pack

108 + (this branch is tangled with jc/split-blob.)

109 +

110 +Trivially shrinks the on-disk size of the index file to save both I/O and

111 +checksum overhead. It even comes with a technical doc updates.

112 +

113 +The topic should give a solid base to build on further updates, with the

114 +code refactoring in its earlier parts, and the backward compatibility

115 +mechanism in its later parts.

116 +

117 +* jc/rerere-train (2012-04-30) 1 commit

118 + (merged to 'next' on 2012-04-30 at 0cc4308)

119 + + contrib/rerere-train: use installed git-sh-setup

120 +

121 +A script written long time ago proved to be useful this week for me ;-)

122 +with a minor tweak.

123 +

124 +* jk/doc-asciidoc-inline-literal (2012-04-26) 1 commit

125 + (merged to 'next' on 2012-04-30 at a52b4e6)

126 + + docs: stop using asciidoc no-inline-literal

127 +

128 +Our documentation was written for an ancient version of AsciiDoc,

129 +making the source not very readable.

130 +

131 +* jk/maint-config-bogus-section (2012-04-25) 1 commit

132 + (merged to 'next' on 2012-04-26 at 9919198)

133 + + config: reject bogus section names for --rename-section

134 +

135 +"git config --rename-section" to rename an existing section into a

136 +bogus one did not check the new name.

137 +

138 +* jk/maint-gitweb-test-use-sane-perl (2012-05-01) 2 commits

139 + (merged to 'next' on 2012-05-01 at 88b3f80)

140 + + Consistently use perl from /usr/bin/ for scripts

141 + + t/gitweb-lib: use $PERL_PATH to run gitweb

142 +

143 +When using a Perl script on a system where "perl" found on user's $PATH

144 +could be ancient or otherwise broken, we allow builders to specify the

145 +path to a good copy of Perl with $PERL_PATH. The gitweb test forgot to

146 +use that Perl when running its test.

147 +

148 +* ld/git-p4-tags-and-labels (2012-04-25) 7 commits

149 + (merged to 'next' on 2012-04-25 at 8b959e5)

150 + + git p4: fix unit tests

151 + (merged to 'next' on 2012-04-24 at bf55d92)

152 + + git p4: move verbose to base class

153 + + git p4: Ignore P4EDITOR if it is empty

154 + + git p4: Squash P4EDITOR in test harness

155 + + git p4: fix-up "import/export of labels to/from p4"

156 + (merged to 'next' on 2012-04-15 at 1b1e9a1)

157 + + git p4: import/export of labels to/from p4

158 + + git p4: Fixing script editor checks

159 +

160 +Support p4 labels by importing/exporting them as git tags.

161 +

162 +* lp/diffstat-with-graph (2012-04-27) 8 commits

163 + (merged to 'next' on 2012-04-30 at b301202)

164 + + t4052: work around shells unable to set COLUMNS to 1

165 + + Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph

166 + (merged to 'next' on 2012-04-23 at 8de0747)

167 + + Prevent graph_width of stat width from falling below min

168 + + t4052: Test diff-stat output with minimum columns

169 + + t4052: Adjust --graph --stat output for prefixes

170 + + Adjust stat width calculations to take --graph output into account

171 + + Add output_prefix_length to diff_options

172 + + t4052: test --stat output with --graph

173 + (this branch uses zj/mksh-columns-breakage; is tangled with nd/columns.)

174 +

175 +"log --graph" was not very friendly with "--stat" option and its output

176 +had line breaks at wrong places.

177 +

178 +* mm/simple-push (2012-04-24) 7 commits

179 + (merged to 'next' on 2012-04-30 at 1a571d2)

180 + + push.default doc: explain simple after upstream

181 + + push: document the future default change for push.default (matching -> simple)

182 + + t5570: use explicit push refspec

183 + + push: introduce new push.default mode "simple"

184 + + t5528-push-default.sh: add helper functions

185 + + Undocument deprecated alias 'push.default=tracking'

186 + + Documentation: explain push.default option a bit more

187 + (this branch is used by mm/push-default-switch-warning.)

188 +

189 +New users tend to work on one branch at a time and push the result

190 +out. The current and upstream modes of push is a more suitable default

191 +mode than matching mode for these people, but neither is surprise-free

192 +depending on how the project is set up. Introduce a "simple" mode that

193 +is a subset of "upstream" but only works when the branch is named the same

194 +between the remote and local repositories.

195 +

196 +The plan is to make it the new default when push.default is not

197 +configured.

198 +

199 +* nd/i18n (2012-04-25) 11 commits

200 + (merged to 'next' on 2012-04-30 at d8bbd7a)

201 + + help: replace underlining "help -a" headers using hyphens with a blank line

202 + (merged to 'next' on 2012-04-24 at 07965a4)

203 + + i18n: bundle: mark strings for translation

204 + + i18n: index-pack: mark strings for translation

205 + + i18n: apply: update say_patch_name to give translators complete sentence

206 + + i18n: apply: mark strings for translation

207 + + i18n: remote: mark strings for translation

208 + + i18n: make warn_dangling_symref() automatically append \n

209 + + i18n: help: mark strings for translation

210 + + i18n: mark relative dates for translation

211 + + strbuf: convenience format functions with \n automatically appended

212 + + Makefile: feed all header files to xgettext

213 +

214 +More message strings marked for i18n.

215 +

216 +* nh/empty-rebase (2012-04-24) 4 commits

217 + (merged to 'next' on 2012-04-24 at 91d2dfd)

218 + + git-rebase: add keep_empty flag

219 + + git-cherry-pick: Add test to validate new options

220 + + git-cherry-pick: Add keep-redundant-commits option

221 + + git-cherry-pick: add allow-empty option

222 +

223 +"git rebase" learned to optionally keep commits that do not introduce

224 +any change in the original history.

225 +

226 +* pw/message-cleanup (2012-04-30) 2 commits

227 + (merged to 'next' on 2012-04-30 at 703c0c4)

228 + + remove blank filename in error message

229 + + remove superfluous newlines in error messages

230 +

231 +Many error/warning messages had extra trailing newlines that are

232 +unnecessary.

233 +

234 +* pw/p4-various (2012-04-30) 4 commits

235 + (merged to 'next' on 2012-04-30 at b20428c)

236 + + git p4: submit files with wildcards

237 + + git p4: fix writable file after rename or copy

238 + + git p4: test submit

239 + + git p4: bring back files in deleted client directory

240 +

241 +Miscellaneous updates to "git p4".

242 +

243 +* tr/xdiff-fast-hash (2012-05-01) 2 commits

244 + (merged to 'next' on 2012-05-01 at 5155b98)

245 + + xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE

246 + (merged to 'next' on 2012-04-24 at ed693cf)

247 + + xdiff: load full words in the inner loop of xdl_hash_record

248 +

249 +Use word-at-a-time comparison to find end of line or NUL (end of buffer),

250 +borrowed from the linux-kernel discussion.

251 +

252 +* zj/diff-stat-smaller-num-columns (2012-04-30) 1 commit

253 + (merged to 'next' on 2012-05-01 at eb68d3b)

254 + + diff --stat: use less columns for change counts

255 +

256 +Spend only minimum number of columns necessary to show the number of lines

257 +in the output from "diff --stat", instead of always allocating 4 columns

258 +even when showing changes that are much smaller than 1000 lines.

259

260 * zj/mksh-columns-breakage (2012-04-27) 1 commit

133 - - test-lib: skip test with COLUMNS=1 under mksh

261 + (merged to 'next' on 2012-04-30 at cce82a8)

262 + + test-lib: skip test with COLUMNS=1 under mksh

263 (this branch is used by lp/diffstat-with-graph and nd/columns.)

264

136 -A broken shell does not let us set an environment value to an

137 -arbitrary value, interfering with some of the tests. Introduce a test

138 -prerequisite so that we can skip some tests on such a platform.

139 -

140 -Will merge to 'next'.

265 +A broken shell may not let us set an environment value to an arbitrary

266 +value, interfering with some of the tests. Introduce a test prerequisite

267 +so that we can skip some tests on such a platform.

268

269 --------------------------------------------------

270 [Stalled]

271

272 +* nl/http-proxy-more (2012-04-26) 8 commits

273 + - http: try an uppercase version of $proto_proxy

274 + - http: fix proxy password passing

275 + - http: fix proxy authentication

276 + - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

277 + - http: Avoid limit of retrying request only twice

278 + - http: handle proxy authentication failure (error 407)

279 + - http: handle proxy proactive authentication

280 + - http: try http_proxy env var when http.proxy config option is not set

281 +

282 +Still needs to address review comments from Peff, some of which were

283 +partly addressed with later "fixup" patches queued here.

284 +

285 +It probably is a good idea to re-roll the entire series.

286 +

287 * jc/run-hook-env-1 (2012-03-11) 1 commit

288 - run_hook(): enhance the interface to pass arbitrary environment

289

@@ -150,15 +292,13 @@ Not urgent.

292 Updates run_hook() API to be much less specific to "commit". It would

293 only be useful if people start doing more interesting things with hooks.

294

153 -* jc/split-blob (2012-04-03) 7 commits

295 +* jc/split-blob (2012-04-03) 6 commits

296 - chunked-object: streaming checkout

297 - chunked-object: fallback checkout codepaths

298 - bulk-checkin: support chunked-object encoding

299 - bulk-checkin: allow the same data to be multiply hashed

300 - new representation types in the packstream

301 - packfile: use varint functions

160 - + varint: make it available outside the context of pack

161 - (this branch is tangled with jc/index-v4.)

302

303 Not ready.

304

@@ -185,28 +325,6 @@ not working :-(.

325 --------------------------------------------------

326 [Cooking]

327

188 -* mm/simple-push (2012-04-24) 7 commits

189 - - push.default doc: explain simple after upstream

190 - - push: document the future default change for push.default (matching -> simple)

191 - - t5570: use explicit push refspec

192 - - push: introduce new push.default mode "simple"

193 - - t5528-push-default.sh: add helper functions

194 - - Undocument deprecated alias 'push.default=tracking'

195 - - Documentation: explain push.default option a bit more

196 - (this branch is used by mm/push-default-switch-warning.)

197 -

198 -New users tend to work on one branch at a time and push the result

199 -out. The current and upstream modes of push is a more suitable default

200 -mode than matching mode for these people, but neither is surprise-free

201 -depending on how the project is set up. Introduce a "simple" mode that

202 -is a subset of "upstream" but only works when the branch is named the same

203 -between the remote and local repositories.

204 -

205 -The plan is to make it the new default when push.default is not

206 -configured.

207 -

208 -Will merge to 'next'.

209 -

328 * mh/ref-api-lazy-loose (2012-04-26) 18 commits

329 - refs: read loose references lazily

330 - read_loose_refs(): eliminate ref_cache argument

@@ -231,108 +349,24 @@ Refs API is updated to lazily read sub-hierarchies of refs/ namespace,

349 so that we do not have to grab everything from the filesystem when we

350 are only interested in listing branches, for example.

351

234 -* jk/maint-config-bogus-section (2012-04-25) 1 commit

235 - (merged to 'next' on 2012-04-26 at 9919198)

236 - + config: reject bogus section names for --rename-section

237 -

238 -"git config --rename-section" to rename an existing section into a

239 -bogus one did not check the new name.

240 -

241 -Will merge to 'master'.

242 -

243 -* jk/doc-asciidoc-inline-literal (2012-04-26) 1 commit

244 - - docs: stop using asciidoc no-inline-literal

245 -

246 -Our documentation was written for an ancient version of AsciiDoc,

247 -making the source not very readable.

248 -

249 -Will merge to 'next'.

250 -

251 -* nd/i18n (2012-04-25) 11 commits

252 - - help: replace underlining "help -a" headers using hyphens with a blank line

253 - (merged to 'next' on 2012-04-24 at 07965a4)

254 - + i18n: bundle: mark strings for translation

255 - + i18n: index-pack: mark strings for translation

256 - + i18n: apply: update say_patch_name to give translators complete sentence

257 - + i18n: apply: mark strings for translation

258 - + i18n: remote: mark strings for translation

259 - + i18n: make warn_dangling_symref() automatically append \n

260 - + i18n: help: mark strings for translation

261 - + i18n: mark relative dates for translation

262 - + strbuf: convenience format functions with \n automatically appended

263 - + Makefile: feed all header files to xgettext

264 -

265 -More message strings marked for i18n.

266 -

267 -Will merge to 'next'.

268 -

269 -* nh/empty-rebase (2012-04-24) 4 commits

270 - (merged to 'next' on 2012-04-24 at 91d2dfd)

271 - + git-rebase: add keep_empty flag

272 - + git-cherry-pick: Add test to validate new options

273 - + git-cherry-pick: Add keep-redundant-commits option

274 - + git-cherry-pick: add allow-empty option

275 -

276 -"git rebase" learned to optionally keep commits that do not introduce

277 -any change in the original history.

278 -

279 -* lp/diffstat-with-graph (2012-04-27) 8 commits

280 - - t4052: work around shells unable to set COLUMNS to 1

281 - - Merge branch 'zj/mksh-columns-breakage' into lp/diffstat-with-graph

282 - (merged to 'next' on 2012-04-23 at 8de0747)

283 - + Prevent graph_width of stat width from falling below min

284 - + t4052: Test diff-stat output with minimum columns

285 - + t4052: Adjust --graph --stat output for prefixes

286 - + Adjust stat width calculations to take --graph output into account

287 - + Add output_prefix_length to diff_options

288 - + t4052: test --stat output with --graph

289 - (this branch uses zj/mksh-columns-breakage; is tangled with nd/columns.)

290 -

291 -Will merge to 'next'.

352 +This looked mostly sane. Did I miss "needs more work" review comments?

353

354 * nd/columns (2012-04-27) 10 commits

294 - - tag: add --column

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

296 - - status: add --column

297 - - branch: add --column

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

299 - - column: add dense layout support

300 - - t9002: work around shells that are unable to set COLUMNS to 1

301 - - column: add columnar layout

302 - - Stop starting pager recursively

303 - - Add column layout skeleton and git-column

304 - (this branch uses zj/mksh-columns-breakage; is tangled with lp/diffstat-with-graph.)

355 + (merged to 'next' on 2012-04-30 at 93bb157)

356 + + tag: add --column

357 + + column: support piping stdout to external git-column process

358 + + status: add --column

359 + + branch: add --column

360 + + help: reuse print_columns() for help -a

361 + + column: add dense layout support

362 + + t9002: work around shells that are unable to set COLUMNS to 1

363 + + column: add columnar layout

364 + + Stop starting pager recursively

365 + + Add column layout skeleton and git-column

366

367 A couple of commands learn --column option to produce columnar output.

368

308 -* nl/http-proxy-more (2012-04-26) 8 commits

309 - - http: try an uppercase version of $proto_proxy

310 - - http: fix proxy password passing

311 - - http: fix proxy authentication

312 - - http: rename HTTP_REAUTH to HTTP_AUTH_RETRY

313 - - http: Avoid limit of retrying request only twice

314 - - http: handle proxy authentication failure (error 407)

315 - - http: handle proxy proactive authentication

316 - - http: try http_proxy env var when http.proxy config option is not set

317 -

318 -Still needs to address review comments from Peff, some of which were

319 -partly addressed with later "fixup" patches queued here.

320 -

321 -It probably is a good idea to re-roll the entire series.

322 -

323 -* ld/git-p4-tags-and-labels (2012-04-25) 7 commits

324 - (merged to 'next' on 2012-04-25 at 8b959e5)

325 - + git p4: fix unit tests

326 - (merged to 'next' on 2012-04-24 at bf55d92)

327 - + git p4: move verbose to base class

328 - + git p4: Ignore P4EDITOR if it is empty

329 - + git p4: Squash P4EDITOR in test harness

330 - + git p4: fix-up "import/export of labels to/from p4"

331 - (merged to 'next' on 2012-04-15 at 1b1e9a1)

332 - + git p4: import/export of labels to/from p4

333 - + git p4: Fixing script editor checks

334 -

335 -What's the current status of this topic? Pete? Luke?

369 +Will merge to 'master'.

370

371 * nd/threaded-index-pack (2012-04-19) 4 commits

372 - index-pack: disable threading if NO_PREAD is defined

@@ -340,51 +374,25 @@ What's the current status of this topic? Pete? Luke?

374 - index-pack: split second pass obj handling into own function

375 - compat/win32/pthread.h: Add an pthread_key_delete() implementation

376

343 -* tr/xdiff-fast-hash (2012-04-09) 1 commit

344 - (merged to 'next' on 2012-04-24 at ed693cf)

345 - + xdiff: load full words in the inner loop of xdl_hash_record

346 -

347 -Breakage reported on MacOS X. Perhaps needs to be reverted out of 'next'.

348 -

349 -* jc/index-v4 (2012-04-27) 12 commits

350 - (merged to 'next' on 2012-04-29 at ed71f9c)

351 - + index-v4: document the entry format

352 - + unpack-trees: preserve the index file version of original

353 - (merged to 'next' on 2012-04-19 at 5e4b029)

354 - + update-index: upgrade/downgrade on-disk index version

355 - + read-cache.c: write prefix-compressed names in the index

356 - + read-cache.c: read prefix-compressed names in index on-disk version v4

357 - + read-cache.c: move code to copy incore to ondisk cache to a helper function

358 - + read-cache.c: move code to copy ondisk to incore cache to a helper function

359 - + read-cache.c: report the header version we do not understand

360 - + read-cache.c: make create_from_disk() report number of bytes it consumed

361 - + read-cache.c: allow unaligned mapping of the index file

362 - + cache.h: hide on-disk index details

363 - + varint: make it available outside the context of pack

364 - (this branch is tangled with jc/split-blob.)

365 -

366 -Trivially shrinks the on-disk size of the index file to save both I/O and

367 -checksum overhead. It even comes with a technical doc updates ;-)

368 -

377 * th/difftool-diffall (2012-04-23) 8 commits

370 - - difftool: print list of valid tools with '--tool-help'

371 - - difftool: teach difftool to handle directory diffs

372 - - difftool: eliminate setup_environment function

373 - - difftool: stop appending '.exe' to git

374 - - difftool: remove explicit change of PATH

375 - - difftool: exit(0) when usage is printed

376 - - difftool: add '--no-gui' option

377 - - difftool: parse options using Getopt::Long

378 + (merged to 'next' on 2012-05-02 at fdc9f60)

379 + + difftool: print list of valid tools with '--tool-help'

380 + + difftool: teach difftool to handle directory diffs

381 + + difftool: eliminate setup_environment function

382 + + difftool: stop appending '.exe' to git

383 + + difftool: remove explicit change of PATH

384 + + difftool: exit(0) when usage is printed

385 + + difftool: add '--no-gui' option

386 + + difftool: parse options using Getopt::Long

387

388 Rolls the two-directory-diff logic from diffall script (in contrib/) into

389 "git difftool" framework.

390

382 -What's the doneness of this topic? David? Tim?

391 +Will merge to 'master'.

392

393 * mm/push-default-switch-warning (2012-04-26) 2 commits

394 - t5541: warning message is given even with --quiet

395 - push: start warning upcoming default change for push.default

387 - (this branch uses mm/simple-push.)

396

397 Will squash the two, but this has to wait for a few release cycles.

398

What's cooking (2012/05 #01)