38a106ebf7 · matheusbsbs/matheus-bagliano

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

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Dec 2012, #04; Sun, 16)

4 -X-master-at: 2e900297dbb9d5bd086ea56eed07027374759791

5 -X-next-at: c7347146c5a6525cce87e5be8258cb86f32485c4

3 +Subject: What's cooking in git.git (Dec 2012, #05; Tue, 18)

4 +X-master-at: b7cd0c9b692af7728a1d876a3e4fe760956e00c3

5 +X-next-at: c92fcd913d6db915141f6e28e838c7976a746786

6

7 -What's cooking in git.git (Dec 2012, #04; Sun, 16)

7 +What's cooking in git.git (Dec 2012, #05; Tue, 18)

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 -The tip of the 'master' branch is 1.8.1-rc2; hopefully we can go

15 -final around the end of next week.

14 +The tip of the 'master' branch is a bit past 1.8.1-rc2; hopefully we

15 +can go final around the end of the week.

16

17 Many topics are getting into good shape in 'next', hopefully ready

18 to be merged soon after the 1.8.1 final.

@@ -25,166 +25,78 @@ repositories listed at

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

26 [New Topics]

27

28 -* ja/directory-attrs (2012-12-13) 2 commits

29 - - [squash] simplify find-basename in attr.c

30 - - Add directory pattern matching to attributes

31 -

32 - The attribute mechanism didn't allow limiting attributes to be

33 - applied to only a single directory itself with "path/" like the

34 - exclude mechanism does.

35 -

36 - Will merge to 'next' after squashing the microfix.

37 -

38 -

39 -* jk/mailmap-cleanup (2012-12-12) 5 commits

40 - - contrib: update stats/mailmap script

41 - - .mailmap: normalize emails for Linus Torvalds

42 - - .mailmap: normalize emails for Jeff King

43 - - .mailmap: fix broken entry for Martin Langhoff

44 - - .mailmap: match up some obvious names/emails

45 -

46 - Update various entries in our .mailmap file.

47 -

48 - Will merge to 'next'.

49 -

50 -

51 -* jk/mailmap-from-blob (2012-12-13) 5 commits

52 - - mailmap: default mailmap.blob in bare repositories

53 - - mailmap: fix some documentation loose-ends for mailmap.blob

54 - - mailmap: clean up read_mailmap error handling

55 - - mailmap: support reading mailmap from blobs

56 - - mailmap: refactor mailmap parsing for non-file sources

57 -

58 - Allow us to read, and default to read, mailmap files from the tip

59 - of the history in bare repositories. This will help running tools

60 - like shortlog in server settings.

61 -

62 - Will merge to 'next'.

63 -

64 -

65 -* nd/index-format-doc (2012-12-13) 1 commit

66 - - index-format.txt: clarify what is "invalid"

67 -

68 - Will merge to 'next'.

69 -

70 -

71 -* as/doc-for-devs (2012-12-16) 2 commits

72 - - Documentation: move support for old compilers to CodingGuidelines

73 - - SubmittingPatches: add convention of prefixing commit messages

74 -

75 - It might be a better idea to move the text the bottom one adds to

76 - the extended description from the quick checklist part.

77 -

78 -

79 -* cc/no-git-gui-rebuild-depend (2012-12-16) 2 commits

28 +* cc/no-gitk-build-dependency (2012-12-18) 3 commits

29 + - Makefile: replace "echo 1>..." with "echo >..."

30 - Makefile: detect when PYTHON_PATH changes

31 - Makefile: remove tracking of TCLTK_PATH

32

83 - The bottom one associates the issue with git-gui, but what it

84 - removes is a remnant of gitk support when it did not have a

85 - separate Makefile; we may need to add the logic there.

86 -

87 -

88 -* dm/port (2012-12-15) 3 commits

89 - - Generalize the inclusion of strings.h

90 - - Detect when the passwd struct is missing pw_gecos

91 - - Support builds when sys/param.h is missing

92 -

93 - It could turn out that we may be able to get rid of sys/param.h

94 - altogether, but one step at a time. Inputs from people on minority

95 - platforms are very much appreciated---does your platform build fine

96 - when the inclusion of the file is removed from git-compat-util.h?

97 -

98 - Will merge to 'next'.

99 -

100 -

101 -* jc/fetch-tags-doc (2012-12-13) 1 commit

102 - - fetch --tags: clarify documentation

103 -

104 - The explanation for "fetch --tags" was actually talking more about

105 - "fetch --no-tags". Clariify what "--tags" really means.

106 -

107 - Will merge to 'next'.

33 + Remove leftover bits from an earlier change to move gitk in its own

34 + subdirectory. Reimplementing the dependency tracking rules needs

35 + to be done in gitk history separately.

36

37

110 -* jk/avoid-mailto-invalid-in-doc (2012-12-16) 1 commit

111 - - Documentation: don't link to example mail addresses

38 +* cr/doc-checkout-branch (2012-12-18) 2 commits

39 + - Documentation/git-checkout.txt: document 70c9ac2 behavior

40 + - Documentation/git-checkout.txt: clarify usage

41

113 - Avoids invalid sample e-mail addresses from becoming mailto links

114 - in the formatted output, which by itself is "Meh" for me (who

115 - cares?) but it highlights some issues with ``pretty quotes''.

42 + Document the magic "git checkout <no-such-branch>" hack to create

43 + local branch out of a remote tracking branch that hasn't been

44 + documented so far.

45

46 Will merge to 'next'.

47

48

120 -* jk/complete-commit-c (2012-12-15) 1 commit

121 - - completion: complete refs for "git commit -c"

49 +* jc/format-color-auto (2012-12-17) 2 commits

50 + - log --format: teach %C(auto,black) to respect color config

51 + - t6006: clean up whitespace

52

123 - Complete "git commmit -c foo<TAB>" into a refname that begins with

124 - "foo".

53 + Introduce "log --format=%C(auto,blue)Foo%C(auto,reset)" that does

54 + not color its output when writing to a non-terminal.

55

56 Will merge to 'next'.

57

58

129 -* jk/error-const-return (2012-12-15) 2 commits

130 - - silence some -Wuninitialized false positives

131 - - make error()'s constant return value more visible

132 -

133 - Help compilers' flow analysis by making it more explicit that

134 - error() always returns -1, to reduce false "variable used

135 - uninitialized" warnings.

136 -

137 - This is still an RFC.

138 -

139 -

140 -* mk/qnx (2012-12-15) 2 commits

141 - - Port to QNX

142 - - Make lock local to fetch_pack

143 -

144 - Port to QNX; we may want to rebase this on top of dm/port topic as

145 - it also wants to use the HAVE_STRINGS_H mechanism it introduces.

146 -

59 +* ss/svn-prompt (2012-12-17) 3 commits

60 + - git-svn, perl/Git.pm: extend and use Git->prompt method for querying users

61 + - perl/Git.pm: Honor SSH_ASKPASS as fallback if GIT_ASKPASS is not set

62 + - git-svn, perl/Git.pm: add central method for prompting passwords

63

148 -* rj/maint-cygwin-say-color (2012-12-15) 1 commit

149 - - tests: Allow customization of how say_color() prints

64 + Waiting for an Ack from the area export.

65

151 - Even though I do not think of a cleaner way to do this, I am not

152 - happy with the way how $GIT_TEST_PRINT and $GIT_TEST_PRINT_LN are

153 - interpolated into the command line with token splitting at $IFS.

66

67 +* zk/clean-report-failure (2012-12-17) 1 commit

68 + - git-clean: Display more accurate delete messages

69

156 -* sl/readme-gplv2 (2012-12-15) 2 commits

157 - - README: it does not matter who the current maintainer is

158 - - README: Git is released under the GPLv2, not just "the GPL"

70 + "git clean" states what it is going to remove and then goes on to

71 + remove it, but sometimes it only discovers things that cannot be

72 + removed after recursing into a directory, which makes the output

73 + confusing and even wrong.

74

160 - Clarify that the project as a whole is GPLv2 only, with some parts

161 - borrowed under different licenses that are compatible with GPLv2.

75 + Waiting for responses to review comments.

76

163 - Will merge to 'next'.

77

78 +* jc/doc-diff-blobs (2012-12-18) 1 commit

79 + - Documentation: Describe "git diff <blob> <blob>" separately

80

166 -* ta/api-index-doc (2012-12-16) 1 commit

167 - - Remove misleading date from api-index-skel.txt

81 + "git diff <blob> <blob>" was not documented and was only hinted as

82 + an extension to "git diff <commit> <commit> -- <pathspec>", but

83 + comparison between two blobs are more special than that. It does

84 + not take any pathspec to begin with.

85

169 - Will merge to 'next'.

86

171 ---------------------------------------------------

172 -[Graduated to "master"]

87 +* mp/complete-paths (2012-12-18) 1 commit

88 + - git-completion.bash: add support for path completion

89

174 -* mh/doc-remote-helpers (2012-12-07) 6 commits

175 - (merged to 'next' on 2012-12-07 at 7ac8c25)

176 - + git-remote-helpers.txt: clarify options & ref list attributes

177 - + git-remote-helpers.txt: clarify command <-> capability correspondences

178 - + git-remote-helpers.txt: rearrange description of capabilities

179 - + git-remote-helpers.txt: minor grammar fix

180 - + git-remote-helpers.txt: document missing capabilities

181 - + git-remote-helpers.txt: document invocation before input format

90 + The completion script used to let the default completer to suggest

91 + pathnames, which gave too many irrelevant choices (e.g. "git add"

92 + would not want to add an unmodified path). Teach it to use a more

93 + git-aware logic to enumerate only relevant ones.

94

95 --------------------------------------------------

96 [Stalled]

97

98 * jc/merge-blobs (2012-12-13) 5 commits

187 - - [broken] wip to fix d/f conflicts

99 + . [broken] wip to fix d/f conflicts

100 - merge-tree: add comments to clarify what these functions are doing

101 - merge-tree: lose unused "resolve_directories"

102 - merge-tree: lose unused "flags" from merge_list

@@ -388,10 +300,138 @@ repositories listed at

300 --------------------------------------------------

301 [Cooking]

302

391 -* as/test-tweaks (2012-12-16) 8 commits

303 +* ja/directory-attrs (2012-12-17) 1 commit

304 + (merged to 'next' on 2012-12-17 at ced8e73)

305 + + Add directory pattern matching to attributes

306 +

307 + The attribute mechanism didn't allow limiting attributes to be

308 + applied to only a single directory itself with "path/" like the

309 + exclude mechanism does.

310 +

311 + Will cook in 'next'.

312 +

313 +

314 +* jk/mailmap-cleanup (2012-12-12) 5 commits

315 + (merged to 'next' on 2012-12-17 at 07c1a11)

316 + + contrib: update stats/mailmap script

317 + + .mailmap: normalize emails for Linus Torvalds

318 + + .mailmap: normalize emails for Jeff King

319 + + .mailmap: fix broken entry for Martin Langhoff

320 + + .mailmap: match up some obvious names/emails

321 +

322 + Update various entries in our .mailmap file.

323 +

324 +

325 +* jk/mailmap-from-blob (2012-12-13) 5 commits

326 + (merged to 'next' on 2012-12-17 at 14b7cdc)

327 + + mailmap: default mailmap.blob in bare repositories

328 + + mailmap: fix some documentation loose-ends for mailmap.blob

329 + + mailmap: clean up read_mailmap error handling

330 + + mailmap: support reading mailmap from blobs

331 + + mailmap: refactor mailmap parsing for non-file sources

332 +

333 + Allow us to read, and default to read, mailmap files from the tip

334 + of the history in bare repositories. This will help running tools

335 + like shortlog in server settings.

336 +

337 +

338 +* nd/index-format-doc (2012-12-13) 1 commit

339 + (merged to 'next' on 2012-12-17 at 7984924)

340 + + index-format.txt: clarify what is "invalid"

341 +

342 +

343 +* as/doc-for-devs (2012-12-16) 2 commits

344 + - Documentation: move support for old compilers to CodingGuidelines

345 + - SubmittingPatches: add convention of prefixing commit messages

346 +

347 + It might be a better idea to move the text the bottom one adds to

348 + the extended description from the quick checklist part.

349 +

350 + Will merge to 'next'.

351 +

352 +

353 +* dm/port (2012-12-18) 4 commits

354 + - git-compat-util.h: do not #include <sys/param.h> by default

355 + - Generalize the inclusion of strings.h

356 + - Detect when the passwd struct is missing pw_gecos

357 + - Support builds when sys/param.h is missing

358 +

359 + Will merge to 'next'.

360 +

361 +

362 +* jc/fetch-tags-doc (2012-12-13) 1 commit

363 + (merged to 'next' on 2012-12-17 at 857413a)

364 + + fetch --tags: clarify documentation

365 +

366 + The explanation for "fetch --tags" was actually talking more about

367 + "fetch --no-tags". Clariify what "--tags" really means.

368 +

369 +

370 +* jk/avoid-mailto-invalid-in-doc (2012-12-16) 1 commit

371 + - Documentation: don't link to example mail addresses

372 +

373 + Avoids invalid sample e-mail addresses from becoming mailto links

374 + in the formatted output, which by itself is "Meh" for me (who

375 + cares?) but it highlights some issues with ``pretty quotes''.

376 +

377 + Will merge to 'next'.

378 +

379 +

380 +* jk/complete-commit-c (2012-12-15) 1 commit

381 + - completion: complete refs for "git commit -c"

382 +

383 + Complete "git commmit -c foo<TAB>" into a refname that begins with

384 + "foo".

385 +

386 + Will merge to 'next'.

387 +

388 +

389 +* jk/error-const-return (2012-12-15) 2 commits

390 + - silence some -Wuninitialized false positives

391 + - make error()'s constant return value more visible

392 +

393 + Help compilers' flow analysis by making it more explicit that

394 + error() always returns -1, to reduce false "variable used

395 + uninitialized" warnings.

396 +

397 + This is still an RFC.

398 +

399 +

400 +* mk/qnx (2012-12-15) 2 commits

401 + - Port to QNX

402 + - Make lock local to fetch_pack

403 +

404 + Port to QNX; we may want to rebase this on top of dm/port topic as

405 + it also wants to use the HAVE_STRINGS_H mechanism it introduces.

406 +

407 +

408 +* rj/maint-cygwin-say-color (2012-12-15) 1 commit

409 + - tests: Allow customization of how say_color() prints

410 +

411 + Even though I do not think of a cleaner way to do this, I am not

412 + happy with the way how $GIT_TEST_PRINT and $GIT_TEST_PRINT_LN are

413 + interpolated into the command line with token splitting at $IFS.

414 +

415 +

416 +* sl/readme-gplv2 (2012-12-15) 2 commits

417 + - README: it does not matter who the current maintainer is

418 + - README: Git is released under the GPLv2, not just "the GPL"

419 +

420 + Clarify that the project as a whole is GPLv2 only, with some parts

421 + borrowed under different licenses that are compatible with GPLv2.

422 +

423 + Will merge to 'next'.

424 +

425 +

426 +* ta/api-index-doc (2012-12-16) 1 commit

427 + - Remove misleading date from api-index-skel.txt

428 +

429 + Will merge to 'next'.

430 +

431 +

432 +* as/test-tweaks (2012-12-17) 7 commits

433 - tests: paint unexpectedly fixed known breakages in bold red

434 - tests: test the test framework more thoroughly

394 - - (squash) dq $name

435 - tests: refactor mechanics of testing in a sub test-lib

436 - tests: change info messages from yellow/brown to bold cyan

437 - tests: paint skipped tests in bold blue

@@ -401,7 +441,7 @@ repositories listed at

441 Various minor tweaks to the test framework to paint its output

442 lines in colors that match what they mean better.

443

404 - Will merge to 'next' after squashing the microfix.

444 + Will merge to 'next'.

445

446

447 * sp/shortlog-missing-lf (2012-12-11) 2 commits

@@ -432,12 +472,13 @@ repositories listed at

472

473

474 * jc/fetch-ignore-symref (2012-12-11) 1 commit

435 - - fetch: ignore wildcarded refspecs that update local symbolic refs

475 + (merged to 'next' on 2012-12-17 at 370e2c8)

476 + + fetch: ignore wildcarded refspecs that update local symbolic refs

477

478 Avoid false error from an attempt to update local symbolic ref via

479 fetch.

480

440 - Will merge to 'next'.

481 + Will cook in 'next'.

482

483

484 * md/gitweb-sort-by-age (2012-12-11) 1 commit

@@ -474,13 +515,12 @@ repositories listed at

515

516

517 * jc/same-encoding (2012-12-10) 1 commit

477 - - format_commit_message(): simplify calls to logmsg_reencode()

518 + (merged to 'next' on 2012-12-17 at 86b41c7)

519 + + format_commit_message(): simplify calls to logmsg_reencode()

520

521 Finishing touches to the series to unify "Do we need to reencode

522 between these two encodings?" logic.

523

482 - Will merge to 'next'.

483 -

524

525 * nd/invalidate-i-t-a-cache-tree (2012-12-15) 4 commits

526 - cache-tree: invalidate i-t-a paths after generating trees

What's cooking (2012/12 #05)