cccdf395f6 · matheusbsbs/matheus-bagliano

@@ -1,21 +1,19 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (May 2013, #04; Wed, 15)

4 -X-master-at: 0c2b1cf812be6e7e35bed0844b37e412cd232b6b

5 -X-next-at: 2fb82f5641542fc2b7c7ba84210b67d8255297c8

3 +Subject: What's cooking in git.git (May 2013, #05; Mon, 20)

4 +X-master-at: 9134a460e3ebfc93790e98d74b3cda2bcca8eb8b

5 +X-next-at: 751216b6ed747580cebd6590282b8ff55b96ac72

6

7 -What's cooking in git.git (May 2013, #04; Wed, 15)

7 +What's cooking in git.git (May 2013, #05; Mon, 20)

8 --------------------------------------------------

9

10 Here are the topics that have been cooking. Commits prefixed with

11 '-' are only in 'pu' (proposed updates) while commits prefixed with

12 '+' are in 'next'.

13

14 -We are past -rc2 and haven't seen any regression reported since the

15 -feature freeze started, which may be a good sign (the coming release

16 -is perfect) or a bad sign (nobody is testing). We'll see soon when

17 -we tag the 1.8.3 final sometime next week. We may see subsystem

18 -(git-svn? gitk? git-gui?) and l10n updates before that happens.

14 +The final version of 1.8.3 is expected to be tagged late this week.

15 +While applying a few regression hot-fix patches, a couple of benign

16 +doc updates have also been merged to 'master'.

17

18 You can find the changes described here in the integration branches

19 of the repositories listed at

@@ -23,33 +21,169 @@ of the repositories listed at

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

22

23 --------------------------------------------------

26 -[New Topics]

24 +[Graduated to "master"]

25

26 * dw/asciidoc-sources-are-dot-txt-files (2013-05-10) 1 commit

27 - CodingGuidelines: Documentation/*.txt are the sources

28

29

32 -* fc/doc-style (2013-05-09) 2 commits

33 - - SQUASH??? more consistently update docs

30 +* fc/doc-style (2013-05-09) 1 commit

31 - documentation: trivial style cleanups

32

33 +--------------------------------------------------

34 +[New Topics]

35 +

36 +* fc/remote-bzr (2013-05-16) 6 commits

37 + - remote-bzr: trivial cleanups

38 + - remote-bzr: change global repo

39 + - remote-bzr: delay cloning/pulling

40 + - remote-bzr: simplify get_remote_branch()

41 + - remote-bzr: fix for files with spaces

42 + - remote-bzr: recover from failed clones

43 +

44 + The ones near the tip conflicted with the hotfix for 1.8.3 so I

45 + discarded them for now.

46 +

47 +

48 +* jx/clean-interactive (2013-05-20) 15 commits

49 + - test: add t7301 for git-clean--interactive

50 + - git-clean: add documentation for interactive git-clean

51 + - git-clean: add ask each interactive action

52 + - git-clean: add select by numbers interactive action

53 + - git-clean: add filter by pattern interactive action

54 + - git-clean: use a git-add-interactive compatible UI

55 + - git-clean: add colors to interactive git-clean

56 + - git-clean: show items of del_list in columns

57 + - git-clean: add support for -i/--interactive

58 + - git-clean: refactor git-clean into two phases

59 + - Refactor write_name_quoted_relative, remove unused params

60 + - Refactor quote_path_relative, remove unused params

61 + - quote.c: remove path_relative, use relative_path instead

62 + - path.c: refactor relative_path(), not only strip prefix

63 + - test: add test cases for relative_path

64 +

65 +

66 +* tr/test-v-and-v-subtest-only (2013-05-16) 6 commits

67 + - test-lib: support running tests under valgrind in parallel

68 + - test-lib: allow prefixing a custom string before "ok N" etc.

69 + - test-lib: valgrind for only tests matching a pattern

70 + - test-lib: verbose mode for only tests matching a pattern

71 + - test-lib: refactor $GIT_SKIP_TESTS matching

72 + - test-lib: enable MALLOC_* for the actual tests

73 +

74 + Allows N instances of tests run in parallel, each running 1/N parts

75 + of the test suite under Valgrind, to speed things up.

76 +

77 + The tip one may be useful in practice but is a tad ugly ;-)

78 +

79 +

80 +* rh/merge-options-doc-fix (2013-05-16) 1 commit

81 + - Documentation/merge-options.txt: restore `-e` option

82 +

83 + Even though it is not all that urgent, this can be merged to

84 + 'master' before the final,

85 +

86 +

87 +* rr/zsh-color-prompt (2013-05-17) 3 commits

88 + - prompt: colorize ZSH prompt

89 + - prompt: factor out gitstring coloring logic

90 + - prompt: introduce GIT_PS1_STATESEPARATOR

91 +

92 +

93 +* an/diff-index-doc (2013-05-20) 1 commit

94 + - Documentation/diff-index: mention two modes of operation

95 +

96 +

97 +* fc/contrib-related (2013-05-20) 1 commit

98 + - Add new git-related helper to contrib

99 +

100 +

101 +* mc/describe-first-parent (2013-05-20) 1 commit

102 + - describe: Add --first-parent option

103 +

104 +

105 +* rs/tar-tests (2013-05-20) 6 commits

106 + - t5000: test long filenames

107 + - t5000: simplify tar-tree tests

108 + - t5000: use check_tar for prefix test

109 + - t5000: factor out check_tar

110 + - t5000, t5003: create directories for extracted files lazily

111 + - t5000: integrate export-subst tests into regular tests

112 +

113 +--------------------------------------------------

114 +[Stalled]

115 +

116 +* mh/multimail (2013-04-21) 1 commit

117 + - git-multimail: a replacement for post-receive-email

118 +

119 + Waiting for the initial history to pull from.

120 + $gmane/223564

121 +

122 +

123 +* jc/format-patch (2013-04-22) 2 commits

124 + - format-patch: --inline-single

125 + - format-patch: rename "no_inline" field

126 +

127 + A new option to send a single patch to the standard output to be

128 + appended at the bottom of a message. I personally have no need for

129 + this, but it was easy enough to cobble together. Tests, docs and

130 + stripping out more MIMEy stuff are left as exercises to interested

131 + parties.

132 +

133 + Not ready for inclusion.

134 +

135 +

136 +* jk/gitweb-utf8 (2013-04-08) 4 commits

137 + - gitweb: Fix broken blob action parameters on blob/commitdiff pages

138 + - gitweb: Don't append ';js=(0|1)' to external links

139 + - gitweb: Make feed title valid utf8

140 + - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch

141 +

142 + Various fixes to gitweb.

143 +

144 + Waiting for a reroll after a review.

145 +

146 +

147 +* jk/commit-info-slab (2013-04-19) 3 commits

148 + - commit-slab: introduce a macro to define a slab for new type

149 + - commit-slab: avoid large realloc

150 + - commit: allow associating auxiliary info on-demand

151 + (this branch is used by jc/show-branch.)

152 +

153 + Technology demonstration to show a way we could use unbound number

154 + of flag bits on commit objects.

155 +

156 +

157 +* jn/config-ignore-inaccessible (2013-04-15) 1 commit

158 + (merged to 'next' on 2013-05-07 at 4f09e24)

159 + + config: allow inaccessible configuration under $HOME

160 +

161 + When $HOME is misconfigured to point at an unreadable directory, we

162 + used to complain and die. This loosens the check.

163

37 -* da/darwin (2013-05-15) 3 commits

164 +--------------------------------------------------

165 +[Cooking]

166 +

167 +* da/darwin (2013-05-20) 4 commits

168 - imap-send: eliminate HMAC deprecation warnings on Mac OS X

169 - cache.h: eliminate SHA-1 deprecation warnings on Mac OS X

170 + - Makefile: add support for Apple CommonCrypto facility

171 - Makefile: fix default regex settings on Darwin

172

42 - Waiting for polishing discussion to finish.

173 + I think this is ready for 'next'; not that it matters during the

174 + prerelease feature freeze.

175

176

45 -* fc/macos-x-clipped-write (2013-05-10) 2 commits

46 - - SQUASH???

177 +* fc/macos-x-clipped-write (2013-05-17) 1 commit

178 - compate/clipped-write.c: large write(2) fails on Mac OS X/XNU

179

49 - The tip needs to be squashed, as it was reported to have tested OK.

180 + I think this is ready for 'next'; not that it matters during the

181 + prerelease feature freeze.

182

183

52 -* fc/remote-hg (2013-05-15) 39 commits

184 +* fc/remote-hg (2013-05-20) 41 commits

185 + - remote-hg: tests: fix hg merge

186 + - remote-helpers: tests: use python directly

187 - remote-hg: remove files before modifications

188 - remote-hg: improve lightweight tag author

189 - remote-hg: use remote 'default' not local one

@@ -90,7 +224,8 @@ of the repositories listed at

224 - remote-hg: trivial reorganization

225 - remote-hg: test: be a little more quiet

226

93 - Probably will be one of the early topics to graduate post 1.8.3.

227 + The tip-two need to be split into its own branch, merged to 'next'

228 + and the remainder discarded to be rerolled after 1.8.3.

229

230

231 * hv/config-from-blob (2013-05-12) 5 commits

@@ -104,7 +239,8 @@ of the repositories listed at

239 * jc/t5551-posix-sed-bre (2013-05-12) 1 commit

240 - t5551: do not use unportable sed '\+'

241

107 - Not a regression fix and not urgent.

242 + I think this is ready for 'next'; not that it matters during the

243 + prerelease feature freeze.

244

245

246 * jk/fetch-always-update-tracking (2013-05-12) 4 commits

@@ -121,6 +257,9 @@ of the repositories listed at

257 chance, and we have been updating them when we run "git push" which

258 already breaks the original "predictability" anyway.

259

260 + I think this is ready for 'next'; not that it matters during the

261 + prerelease feature freeze.

262 +

263

264 * nd/clone-connectivity-shortcut (2013-05-11) 4 commits

265 - clone: open a shortcut for connectivity check

@@ -139,19 +278,27 @@ of the repositories listed at

278 - am: tighten a conditional that checks for $dotest

279

280

142 -* kb/ancestry-path-threedots (2013-05-13) 1 commit

281 +* kb/ancestry-path-threedots (2013-05-16) 2 commits

282 + - revision.c: treat A...B merge bases as if manually specified

283 - t6019: demonstrate --ancestry-path A...B breakage

284 (this branch is used by kb/full-history-compute-treesame-carefully-2.)

285

286 + I think this is ready for 'next'; not that it matters during the

287 + prerelease feature freeze.

288

147 -* kb/full-history-compute-treesame-carefully-2 (2013-05-13) 11 commits

148 - - revision.c: treat A...B merge bases as if manually specified

289 +

290 +* kb/full-history-compute-treesame-carefully-2 (2013-05-16) 15 commits

291 + - revision.c: make default history consider bottom commits

292 + - revision.c: don't show all merges for --parents

293 - revision.c: discount side branches when computing TREESAME

294 + - revision.c: add BOTTOM flag for commits

295 - simplify-merges: drop merge from irrelevant side branch

296 - simplify-merges: never remove all TREESAME parents

297 - t6012: update test for tweaked full-history traversal

298 - revision.c: Make --full-history consider more merges

299 + - Documentation: avoid "uninteresting"

300 - rev-list-options.txt: correct TREESAME for P

301 + - t6111: add parents to tests

302 - t6111: allow checking the parents as well

303 - t6111: new TREESAME test set

304 - t6019: test file dropped in -s ours merge

@@ -164,7 +311,7 @@ of the repositories listed at

311 Will not be a 1.8.3 material, but is an important topic.

312

313

167 -* jc/strbuf-branchname-fix (2013-05-15) 1 commit

314 +* jc/strbuf-branchname-fix (2013-05-16) 1 commit

315 - strbuf_branchname(): do not double-expand @{-1}~22

316

317 "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22"

@@ -178,6 +325,9 @@ of the repositories listed at

325 "git diff -c -p" was not showing a deleted line from a hunk when

326 another hunk immediately begins where the earlier one ends.

327

328 + I think this is ready for 'next'; not that it matters during the

329 + prerelease feature freeze.

330 +

331

332 * mm/color-auto-default (2013-05-15) 2 commits

333 - make color.ui default to 'auto'

@@ -186,6 +336,10 @@ of the repositories listed at

336 Flip the default for color.ui to 'auto', which is what many

337 tutorials recommend new users to do.

338

339 + I think this is ready for 'next', but we may want to audit

340 + tutorials to see if we need to adjust them if they suggest to set

341 + color.ui as the first thing to do when they meet Git.

342 +

343

344 * tr/coverage (2013-05-13) 4 commits

345 - coverage: build coverage-untested-functions by default

@@ -196,59 +350,9 @@ of the repositories listed at

350 Update the test coverage support that was left to bitrot for some

351 time.

352

199 ---------------------------------------------------

200 -[Stalled]

201 -

202 -* mh/multimail (2013-04-21) 1 commit

203 - - git-multimail: a replacement for post-receive-email

204 -

205 - Waiting for the initial history to pull from.

206 - $gmane/223564

207 -

208 -

209 -* jc/format-patch (2013-04-22) 2 commits

210 - - format-patch: --inline-single

211 - - format-patch: rename "no_inline" field

212 -

213 - A new option to send a single patch to the standard output to be

214 - appended at the bottom of a message. I personally have no need for

215 - this, but it was easy enough to cobble together. Tests, docs and

216 - stripping out more MIMEy stuff are left as exercises to interested

217 - parties.

218 -

219 - Not ready for inclusion.

220 -

353 + I think this is ready for 'next'; not that it matters during the

354 + prerelease feature freeze.

355

222 -* jk/gitweb-utf8 (2013-04-08) 4 commits

223 - - gitweb: Fix broken blob action parameters on blob/commitdiff pages

224 - - gitweb: Don't append ';js=(0|1)' to external links

225 - - gitweb: Make feed title valid utf8

226 - - gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain, and patch

227 -

228 - Various fixes to gitweb.

229 -

230 - Waiting for a reroll after a review.

231 -

232 -

233 -* jk/commit-info-slab (2013-04-19) 3 commits

234 - - commit-slab: introduce a macro to define a slab for new type

235 - - commit-slab: avoid large realloc

236 - - commit: allow associating auxiliary info on-demand

237 - (this branch is used by jc/show-branch.)

238 -

239 - Technology demonstration to show a way we could use unbound number

240 - of flag bits on commit objects.

241 -

242 -

243 -* jn/config-ignore-inaccessible (2013-04-15) 1 commit

244 - (merged to 'next' on 2013-05-07 at 4f09e24)

245 - + config: allow inaccessible configuration under $HOME

246 -

247 - When $HOME is misconfigured to point at an unreadable directory, we

248 - used to complain and die. This loosens the check.

249 -

250 ---------------------------------------------------

251 -[Cooking]

356

357 * mg/more-textconv (2013-05-10) 7 commits

358 - grep: honor --textconv for the case rev:path

@@ -259,7 +363,8 @@ of the repositories listed at

363 - diff_opt: track whether flags have been set explicitly

364 - t4030: demonstrate behavior of show with textconv

365

262 - Looked reasonable, I think. Comments?

366 + I think this is ready for 'next'; not that it matters during the

367 + prerelease feature freeze.

368

369

370 * jh/shorten-refname (2013-05-07) 4 commits

@@ -284,6 +389,9 @@ of the repositories listed at

389 over git-over-ssh specified in the scp style. Detect this case and

390 clone from a local repository at "foo/bar:baz".

391

392 + I think this is ready for 'next'; not that it matters during the

393 + prerelease feature freeze.

394 +

395

396 * nd/warn-ambiguous-object-name (2013-05-07) 1 commit

397 - get_sha1: improve ambiguity warning regarding SHA-1 and ref names

@@ -303,6 +411,9 @@ of the repositories listed at

411 - completion: synchronize zsh wrapper

412 - completion: cleanup zsh wrapper

413

414 + I think this is ready for 'next'; not that it matters during the

415 + prerelease feature freeze.

416 +

417

418 * rs/empty-archive (2013-05-09) 2 commits

419 - t5004: resurrect original empty tar archive test

@@ -311,6 +422,9 @@ of the repositories listed at

422 Fixes tests added in 1.8.2 era that are broken on BSDs,

423 but it is not all that urgent.

424

425 + I think this is ready for 'next'; not that it matters during the

426 + prerelease feature freeze.

427 +

428

429 * vv/help-unknown-ref (2013-05-08) 2 commits

430 - merge: use help_unknown_ref()

@@ -320,6 +434,9 @@ of the repositories listed at

434 and give an error message that is more specific than "foo is not

435 something we can merge".

436

437 + I think this is ready for 'next'; not that it matters during the

438 + prerelease feature freeze.

439 +

440

441 * fc/fast-export-persistent-marks (2013-05-07) 3 commits

442 - fast-{import,export}: use get_sha1_hex() to read from marks file

@@ -330,6 +447,9 @@ of the repositories listed at

447 arbitrary object name and parsing object when only presence and

448 type information is necessary, etc.

449

450 + I think this is ready for 'next'; not that it matters during the

451 + prerelease feature freeze.

452 +

453

454 * jc/core-checkstat-2.0 (2013-05-06) 2 commits

455 - core.statinfo: remove as promised in Git 2.0

@@ -392,8 +512,8 @@ of the repositories listed at

512 - completion: document tilde expansion failure in tests

513 - completion: add file completion tests

514

395 - I saw this discussed somewhat. Is everybody happy with this

396 - version? This is its v2, in the $gmane/222682 thread.

515 + I think this is ready for 'next'; not that it matters during the

516 + prerelease feature freeze.

517

518

519 * jk/test-output (2013-05-06) 3 commits

What's cooking (2013/05 #05)