9de326a435 · matheusbsbs/matheus-bagliano

@@ -1,114 +1,132 @@

1 To: git@vger.kernel.org

2 -Subject: What's cooking in git.git (Aug 2012, #02; Mon, 6)

3 -X-master-at: bfbf4d477a33be413800f531c3ac0d227f46ab44

4 -X-next-at: 3f6917c89149cdb4eeb86d9daab3854bc3af51ef

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

3 +X-master-at: 61b472ed8b090a3e9240590c85041120a54dd268

4 +X-next-at: 4accbf693d5564e36b727349eebdbcb0d4f70a02

5

6 -What's cooking in git.git (Aug 2012, #02; Mon, 6)

6 +What's cooking in git.git (Aug 2012, #03; Mon, 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 -I am planning to tag 1.7.12-rc2 tomorrow. GSoC "index-v5" topic is

13 -queued in 'pu' together with quick band-aid patches to give people

14 -easier access than applying them individually to their tree.

15 -

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

13 repositories listed at

14

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

16

17 +--------------------------------------------------

18 +[Graduated to "master"]

19 +

20 +* bw/maint-1.7.9-solaris-getpass (2012-08-06) 2 commits

21 + (merged to 'next' on 2012-08-07 at d78bc37)

22 + + Enable HAVE_DEV_TTY for Solaris

23 + + terminal: seek when switching between reading and writing

24 +

25 +The recent update to terminal I/O interface to get passwords &c

26 +interactively didn't quite work on Solaris.

27 +

28 --------------------------------------------------

29 [New Topics]

30

24 -* jk/version-string (2012-08-03) 1 commit

25 - - include agent identifier in capability string

31 +* bc/receive-pack-stdout-protection (2012-08-06) 2 commits

32 + (merged to 'next' on 2012-08-07 at d7aa316)

33 + + receive-pack: do not leak output from auto-gc to standard output

34 + + t/t5400: demonstrate breakage caused by informational message from prune

35

27 -Leftover bits from the "git version" code restructuring, that

28 -actually give us an ability to expose the Git version over the wire

29 -in the protocol exchange.

36 +When "git push" triggered the automatic gc on the receiving end, a

37 +message from "git prune" that said it was removing cruft leaked to

38 +the standard output, breaking the communication protocol.

39

31 -* js/grep-patterntype-config (2012-08-03) 1 commit

32 - - grep: add a grep.patternType configuration setting

40 +Not urgent (non regression).

41

34 -"grep" learned to use a non-standard pattern type by default if a

35 -configuration variable tells it to.

42 +* bc/prune-info (2012-08-07) 1 commit

43 + - prune.c: only print informational message in show_only or verbose mode

44

37 -* mm/die-with-dashdash-help (2012-08-03) 1 commit

38 - - setup: clarify error messages for file/revisions ambiguity

45 +Teach "git prune" without "-v" to be silent about leftover temporary files.

46

40 -Reword error messages.

47 +Not urgent (non regression).

48

42 -* tr/merge-recursive-flush (2012-08-03) 1 commit

43 - - merge-recursive: eliminate flush_buffer() in favor of write_in_full()

49 +* jc/tag-doc (2012-08-06) 1 commit

50 + - Documentation: do not mention .git/refs/* directories

51

45 -Remove unnecessary code.

52 +Our documentation used to assume having files in .git/refs/*

53 +directories was the only to have branches and tags, but that is not

54 +true for quite some time.

55

47 -* tr/void-diff-setup-done (2012-08-03) 1 commit

48 - - diff_setup_done(): return void

56 +Not urgent (non regression).

57

50 -Remove unnecessary code.

58 +* jk/docs-docbook-monospace-display (2012-08-07) 1 commit

59 + - docs: monospace listings in docbook output

60

52 -* mk/test-seq (2012-08-04) 1 commit

53 - (merged to 'next' on 2012-08-06 at 3f6917c)

54 - + tests: Introduce test_seq

55 - (this branch is used by ab/diff-write-incomplete-line.)

61 +The documentation in the TeXinfo format was using indented output

62 +for materials meant to be examples that are better typeset in

63 +monospace.

64

57 -Add a compatibility/utility function to the test framework.

65 +Not urgent (non regression).

66

59 -* ab/diff-write-incomplete-line (2012-08-05) 1 commit

60 - - Fix '\ No newline...' annotation in rewrite diffs

61 - (this branch uses mk/test-seq.)

67 +* jc/maint-protect-sh-from-ifs (2012-08-08) 1 commit

68 + - sh-setup: protect from exported IFS

69

63 -The output from "git diff -B" for a file that ends with an

64 -incomplete line did not put "\ No newline..." on a line of its own.

70 +When the user exports a non-default IFS without HT, scripts that

71 +rely on being able to parse "ls-files -s | while read a b c..."

72 +start to fail. Protect them from such a misconfiguration.

73

66 -Will merge to 'next'.

74 +* jk/check-docs-update (2012-08-08) 8 commits

75 + - check-docs: get documented command list from Makefile

76 + - check-docs: drop git-help special-case

77 + - check-docs: list git-gui as a command

78 + - check-docs: factor out command-list

79 + - command-list: mention git-credential-* helpers

80 + - command-list: add git-sh-i18n

81 + - check-docs: update non-command documentation list

82 + - check-docs: mention gitweb specially

83

68 -* pg/maint-apply-remove-unused-variable (2012-08-05) 1 commit

69 - (merged to 'next' on 2012-08-05 at aa9f5e9)

70 - + apply: delete unused deflate_origlen from patch struct

84 +Simplify "make check-docs" implementation and update its coverage.

85

72 -Remove unused field.

73 -Not urgent.

86 +* js/gitweb-path-info-unquote (2012-08-09) 1 commit

87 + - gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO

88

75 -* tg/index-v5 (2012-08-06) 18 commits

76 - - band-aid! drop double close(fd)

77 - - band-aid!! compilation fix

78 - - p0002-index.sh: add perf test for the index formats

79 - - update-index.c: add a force-rewrite option

80 - - Write resolve-undo data for index-v5

81 - - Write index-v5 cache-tree data

82 - - Write index-v5

83 - - Read cache-tree in index-v5

84 - - Read resolve-undo data

85 - - Read index-v5

86 - - Make in-memory format aware of stat_crc

87 - - Add documentation of the index-v5 file format

88 - - t3700: sleep for 1 second, to avoid interfering with the racy code

89 - - t2104: Don't fail for index versions other than [23]

90 - - Modify write functions to prepare for other index formats

91 - - Modify match_stat_basic to prepare for other index formats

92 - - Modify read functions to prepare for other index formats

93 - - Modify cache_header to prepare for other index formats

89 +Stripping of PATH_INFO in gitweb did not take url style quoting into

90 +account, failing to notice directories with funny characters e.g. SP

91 +in their paths.

92

95 -A GSoC project.

93 +* mg/rebase-i-onto-reflog-in-full (2012-08-10) 1 commit

94 + - rebase -i: use full onto sha1 in reflog

95

97 -* nd/index-errno (2012-08-06) 1 commit

98 - (merged to 'next' on 2012-08-06 at a9f2101)

99 - + read_index_from: remove bogus errno assignments

96 +The reflog entries left by "git rebase" and "git rebase -i" were

97 +inconsistent.

98 +

99 +* mz/empty-rebase-test (2012-08-09) 1 commit

100 + - add tests for 'git rebase --keep-empty'

101 +

102 +* jc/capabilities (2012-08-10) 1 commit

103 + - fetch-pack: do not ask for unadvertised capabilities

104 + (this branch uses jk/version-string.)

105 +

106 +Some capabilities were asked by fetch-pack even when upload-pack did

107 +not advertise that they are available. Fix fetch-pack not to do so.

108 +

109 +May have to be rebased to older maintenance tracks before moving

110 +forward.

111 +

112 +* pw/p4-use-client-spec-branch-detection (2012-08-11) 5 commits

113 + - git p4: make branch detection work with --use-client-spec

114 + - git p4: do wildcard decoding in stripRepoPath

115 + - git p4: set self.branchPrefixes in initialization

116 + - git p4 test: add broken --use-client-spec --detect-branches tests

117 + - git p4 test: move client_view() function to library

118

119 --------------------------------------------------

120 [Stalled]

121

122 * mz/rebase-range (2012-07-18) 7 commits

105 - - rebase (without -p): correctly calculate patches to rebase

106 - - rebase -p: don't request --left-right only to ignore left side

107 - - rebase -p: use --cherry-mark for todo file

108 - - git-rebase--interactive.sh: look up subject in add_pick_line

109 - - git-rebase--interactive: group all $preserve_merges code

110 - - git-rebase--interactive.sh: extract function for adding "pick" line

111 - - git-rebase--am.sh: avoid special-casing --keep-empty

123 + . rebase (without -p): correctly calculate patches to rebase

124 + . rebase -p: don't request --left-right only to ignore left side

125 + . rebase -p: use --cherry-mark for todo file

126 + . git-rebase--interactive.sh: look up subject in add_pick_line

127 + . git-rebase--interactive: group all $preserve_merges code

128 + . git-rebase--interactive.sh: extract function for adding "pick" line

129 + . git-rebase--am.sh: avoid special-casing --keep-empty

130

131 Expecting a reroll.

132

@@ -154,15 +172,6 @@ Expecting a reroll.

172 "The first remote becomes the default" bit is better done as a

173 separate step.

174

157 -* jc/maint-push-refs-all (2012-05-04) 2 commits

158 - - get_fetch_map(): tighten checks on dest refs

159 - - fetch/push: allow refs/*:refs/*

160 -

161 -Allows pushing and fetching refs/stash.

162 -There still seem to be other bugs hiding (e.g. try pushing twice).

163 -

164 -Not ready.

165 -

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

176 - chunked-object: streaming checkout

177 - chunked-object: fallback checkout codepaths

@@ -196,39 +205,151 @@ working :-<.

205 --------------------------------------------------

206 [Cooking]

207

208 +* jc/maint-push-refs-all (2012-08-07) 2 commits

209 + - get_fetch_map(): tighten checks on dest refs

210 + - fetch/push: allow refs/*:refs/*

211 +

212 +Allows pushing and fetching refs/stash.

213 +

214 +* jk/version-string (2012-08-10) 3 commits

215 + (merged to 'next' on 2012-08-10 at d8dcb00)

216 + + do not send client agent unless server does first

217 + + send-pack: fix capability-sending logic

218 + (merged to 'next' on 2012-08-09 at 64dc91b)

219 + + include agent identifier in capability string

220 + (this branch is used by jc/capabilities.)

221 +

222 +Leftover bits from the "git version" code restructuring, that give

223 +us an ability to expose the Git version over the wire in the

224 +protocol exchange. But we do so carefully only to the other end that

225 +understands it.

226 +

227 +Not urgent (non regression).

228 +

229 +* js/grep-patterntype-config (2012-08-03) 1 commit

230 + (merged to 'next' on 2012-08-09 at 1a08d6c)

231 + + grep: add a grep.patternType configuration setting

232 +

233 +"grep" learned to use a non-standard pattern type by default if a

234 +configuration variable tells it to.

235 +

236 +Not urgent (non regression).

237 +

238 +* mm/die-with-dashdash-help (2012-08-03) 1 commit

239 + (merged to 'next' on 2012-08-09 at 1aae096)

240 + + setup: clarify error messages for file/revisions ambiguity

241 +

242 +Reword error messages.

243 +Not urgent (non regression).

244 +

245 +* tr/merge-recursive-flush (2012-08-03) 1 commit

246 + (merged to 'next' on 2012-08-09 at da826ec)

247 + + merge-recursive: eliminate flush_buffer() in favor of write_in_full()

248 +

249 +Remove unnecessary code.

250 +Not urgent (non regression).

251 +

252 +* tr/void-diff-setup-done (2012-08-03) 1 commit

253 + (merged to 'next' on 2012-08-09 at 668a46f)

254 + + diff_setup_done(): return void

255 +

256 +Remove unnecessary code.

257 +Not urgent (non regression).

258 +

259 +* mk/test-seq (2012-08-04) 1 commit

260 + (merged to 'next' on 2012-08-06 at 3f6917c)

261 + + tests: Introduce test_seq

262 + (this branch is used by ab/diff-write-incomplete-line.)

263 +

264 +Add a compatibility/utility function to the test framework.

265 +

266 +Not urgent (non regression).

267 +

268 +* ab/diff-write-incomplete-line (2012-08-05) 1 commit

269 + (merged to 'next' on 2012-08-07 at dcf02ae)

270 + + Fix '\ No newline...' annotation in rewrite diffs

271 + (this branch uses mk/test-seq.)

272 +

273 +The output from "git diff -B" for a file that ends with an

274 +incomplete line did not put "\ No newline..." on a line of its own.

275 +

276 +Not urgent (non regression).

277 +

278 +* pg/maint-apply-remove-unused-variable (2012-08-05) 1 commit

279 + (merged to 'next' on 2012-08-05 at aa9f5e9)

280 + + apply: delete unused deflate_origlen from patch struct

281 +

282 +Remove unused field.

283 +Not urgent (non regression).

284 +

285 +* tg/index-v5 (2012-08-09) 15 commits

286 + - fixup! Read index-v5

287 + - fixup! update-index.c: always rewrite the index when index-version is given

288 + - p0002-index.sh: add perf test for the index formats

289 + - update-index.c: always rewrite the index when index-version is given

290 + - Write resolve-undo data for index-v5

291 + - Write index-v5 cache-tree data

292 + - Write index-v5

293 + - Read cache-tree in index-v5

294 + - Read resolve-undo data

295 + - Read index-v5

296 + - Make in-memory format aware of stat_crc

297 + - Add documentation of the index-v5 file format

298 + - t3700: Avoid interfering with the racy code

299 + - t2104: Don't fail for index versions other than [23]

300 + - Move index v2 specific functions to their own file

301 +

302 +A GSoC project, queued here primarily to give people an easier

303 +access to the state of the last posted version, plus trivial

304 +fixups.

305 +

306 +* nd/index-errno (2012-08-06) 1 commit

307 + (merged to 'next' on 2012-08-06 at a9f2101)

308 + + read_index_from: remove bogus errno assignments

309 +

310 +Assignments to errno before calling system functions that used to

311 +matter in the old code were left behind after the code structure

312 +changed sufficiently to make them useless.

313 +

314 +Not urgent (non regression).

315 +

316 * jc/maint-sane-execvp-notdir (2012-07-31) 1 commit

200 - - sane_execvp(): ignore non-directory on $PATH

317 + (merged to 'next' on 2012-08-09 at 5dd4240)

318 + + sane_execvp(): ignore non-directory on $PATH

319

320 "git foo" errored out with "Not a directory" when the user had a non

321 directory on $PATH, and worse yet it masked an alias "foo" to run.

322

205 -Not urgent.

323 +Not urgent (non regression).

324

325 * jc/sanitize-nkd-lazy-iconv-open (2012-07-31) 1 commit

208 - - macos: lazily initialize iconv

326 + (merged to 'next' on 2012-08-09 at 832c238)

327 + + macos: lazily initialize iconv

328

329 Teach the code that works around NKD/NKC gotcha on MacOS to call

330 iconv_open() only when it is necessary, in the hope of avoiding

331 set-up overhead.

332

214 -Not urgent.

333 +Not urgent (non regression).

334

335 * tr/maint-send-email-2047 (2012-07-31) 1 commit

217 - - send-email: improve RFC2047 quote parsing

336 + (merged to 'next' on 2012-08-09 at 17dfe57)

337 + + send-email: improve RFC2047 quote parsing

338

339 "git send-email" did not unquote encoded words that appear on the

340 header correctly, and lost "_" from strings.

341

222 -Not urgent.

342 +Not urgent (non regression).

343

344 * cw/cherry-pick-allow-empty-message (2012-08-06) 1 commit

225 - - cherry-pick: add --allow-empty-message option

345 + (merged to 'next' on 2012-08-09 at eab95f6)

346 + + cherry-pick: add --allow-empty-message option

347

348 "git cherry-pick" by default stops when it sees a commit without any

349 log message. The "--allow-empty-message" option can be used to

350 silently proceed.

351

231 -Not urgent.

352 +Not urgent (non regression).

353

354 * ms/git-svn-1.7 (2012-08-02) 20 commits

355 - git-svn: remove ad-hoc canonicalizations

@@ -260,7 +381,7 @@ way URLs are internally passed around, to make it work with SVN 1.7.

381 + t7406: fix misleading "rev-parse --max-count=1 HEAD"

382

383 Test clean-up, with no behaviour change.

263 -Not urgent.

384 +Not urgent (non regression).

385

386 * jk/maint-diff-nul40-as-sentinel (2012-07-29) 1 commit

387 + diff: do not use null sha1 as a sentinel value

@@ -269,7 +390,7 @@ Not urgent.

390 "git diff" had a confusion between taking data from a path in the

391 working tree and taking data from an object that happens to have

392 name 0{40} recorded in a tree.

272 -Not urgent.

393 +Not urgent (non regression).

394

395 * mz/cherry-code-cleanup (2012-07-29) 3 commits

396 - cherry: remove redundant check for merge commit

@@ -277,7 +398,7 @@ Not urgent.

398 - remove unnecessary parameter from get_patch_ids()

399

400 Minor code clean-up on the cherry-pick codepath.

280 -Not urgent.

401 +Not urgent (non regression).

402

403 * jc/maint-config-exit-status (2012-07-30) 1 commit

404 (merged to 'next' on 2012-07-30 at 8392da9)

@@ -288,7 +409,7 @@ being incorrect. Update the implementation to give the documented

409 status for a case that was documented, and introduce a new code for

410 "all other errors".

411

291 -Not urgent.

412 +Not urgent (non regression).

413

414 * jk/maint-null-in-trees (2012-07-29) 2 commits

415 (merged to 'next' on 2012-07-30 at 771c497)

@@ -298,7 +419,7 @@ Not urgent.

419

420 We do not want a link to 0{40} object stored anywhere in our objects.

421

301 -Not urgent.

422 +Not urgent (non regression).

423

424 * sz/submodule-force-update (2012-07-25) 1 commit

425 (merged to 'next' on 2012-07-26 at 3bda2be)

@@ -306,7 +427,7 @@ Not urgent.

427

428 We may want a documentation update and a few tests on top.

429

309 -Not urgent.

430 +Not urgent (non regression).

431

432 * jc/test-prereq (2012-08-04) 8 commits

433 (merged to 'next' on 2012-08-04 at 6dd9156)

@@ -325,9 +446,12 @@ Teaches the test framework to probe rarely used prerequistes lazily,

446 and make use of it for detecting SYMLINKS, CASE_INSENSITIVE_FS and

447 NKD/NKC MacOS x gotcha.

448

328 -Not urgent.

449 +Not urgent (non regression).

450

330 -* da/difftool-updates (2012-07-26) 10 commits

451 +* da/difftool-updates (2012-08-10) 12 commits

452 + (merged to 'next' on 2012-08-10 at 4accbf6)

453 + + Add Code Compare v2.80.4 as a merge / diff tool for Windows

454 + + mergetool,difftool: Document --tool-help consistently

455 (merged to 'next' on 2012-07-26 at 3263461)

456 + difftool: Disable --symlinks on cygwin

457 + difftool: Handle compare() returning -1

@@ -344,7 +468,7 @@ Not urgent.

468 "git difftool --dir-diff" learned to use symbolic links to prepare

469 temporary copy of the working tree when available.

470

347 -Not urgent.

471 +Not urgent (non regression).

472

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

474 (merged to 'next' on 2012-07-23 at fe59cb6)

What's cooking (2012/08 #03)