7556625daf · matheusbsbs/matheus-bagliano

@@ -1,10 +1,10 @@

1 To: git@vger.kernel.org

2 Bcc: lwn@lwn.net

3 -Subject: What's cooking in git.git (Jan 2013, #09; Fri, 25)

3 +Subject: What's cooking in git.git (Jan 2013, #10; Sun, 27)

4 X-master-at: 50a6b54c03219ad74b9f3f839e0321be18daeaf6

5 X-next-at: acf9419c4c1775dd98c80ac4ecc3b5dd89df9fb4

6

7 -What's cooking in git.git (Jan 2013, #09; Fri, 25)

7 +What's cooking in git.git (Jan 2013, #10; Sun, 27)

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

9

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

@@ -19,212 +19,117 @@ repositories listed at

19

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

21

22 ---------------------------------------------------

23 -[Graduated to "master"]

24 -

25 -* as/check-ignore (2013-01-16) 13 commits

26 - (merged to 'next' on 2013-01-18 at ef45aff)

27 - + clean.c, ls-files.c: respect encapsulation of exclude_list_groups

28 - (merged to 'next' on 2013-01-14 at 9df2afc)

29 - + t0008: avoid brace expansion

30 - + add git-check-ignore sub-command

31 - + setup.c: document get_pathspec()

32 - + add.c: extract new die_if_path_beyond_symlink() for reuse

33 - + add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse

34 - + pathspec.c: rename newly public functions for clarity

35 - + add.c: move pathspec matchers into new pathspec.c for reuse

36 - + add.c: remove unused argument from validate_pathspec()

37 - + dir.c: improve docs for match_pathspec() and match_pathspec_depth()

38 - + dir.c: provide clear_directory() for reclaiming dir_struct memory

39 - + dir.c: keep track of where patterns came from

40 - + dir.c: use a single struct exclude_list per source of excludes

41 -

42 - Add a new command "git check-ignore" for debugging .gitignore

43 - files. The variable names may want to get cleaned up but that can

44 - be done in-tree.

45 -

46 -

47 -* as/pre-push-hook (2013-01-18) 3 commits

48 - (merged to 'next' on 2013-01-18 at 37fc4e8)

49 - + Add sample pre-push hook script

50 - + push: Add support for pre-push hooks

51 - + hooks: Add function to check if a hook exists

52 -

53 - Add an extra hook so that "git push" that is run without making

54 - sure what is being pushed is sane can be checked and rejected (as

55 - opposed to the user deciding not pushing).

56 -

57 -

58 -* ch/add-auto-submitted-in-sample-post-receive-email (2013-01-17) 1 commit

59 - (merged to 'next' on 2013-01-18 at e3205db)

60 - + Add Auto-Submitted header to post-receive-email

61 -

62 - Mark e-mails coming from automated processes should be marked as

63 - such; update a sample hook to do so.

64 -

65 -

66 -* cr/push-force-tag-update (2013-01-16) 1 commit

67 - (merged to 'next' on 2013-01-18 at c9091d5)

68 - + push: fix "refs/tags/ hierarchy cannot be updated without --force"

69 - (this branch is used by jc/push-reject-reasons.)

70 -

71 - Regression fix, not to say "already exists" when we traditionally

72 - said "non fast-forward'.

73 -

74 -

75 -* jc/doc-maintainer (2013-01-03) 2 commits

76 - (merged to 'next' on 2013-01-11 at f35d582)

77 - + howto/maintain: mark titles for asciidoc

78 - + Documentation: update "howto maintain git"

79 -

80 - Describe tools for automation that were invented since this

81 - document was originally written.

82 -

83 -

84 -* jk/suppress-clang-warning (2013-01-16) 1 commit

85 - (merged to 'next' on 2013-01-18 at 7c0bda7)

86 - + fix clang -Wunused-value warnings for error functions

87 -

88 -

89 -* mh/imap-send-shrinkage (2013-01-15) 14 commits

90 - (merged to 'next' on 2013-01-18 at 1b7c5ba)

91 - + imap-send.c: simplify logic in lf_to_crlf()

92 - + imap-send.c: fold struct store into struct imap_store

93 - + imap-send.c: remove unused field imap_store::uidvalidity

94 - + imap-send.c: use struct imap_store instead of struct store

95 - + imap-send.c: remove unused field imap_store::trashnc

96 - + imap-send.c: remove namespace fields from struct imap

97 - + imap-send.c: remove struct imap argument to parse_imap_list_l()

98 - + imap-send.c: inline parse_imap_list() in parse_list()

99 - + imap-send.c: remove some unused fields from struct store

100 - + imap-send.c: remove struct message

101 - + imap-send.c: remove struct store_conf

102 - + iamp-send.c: remove unused struct imap_store_conf

103 - + imap-send.c: remove struct msg_data

104 - + imap-send.c: remove msg_data::flags, which was always zero

105 -

106 - Remove a lot of unused code from "git imap-send".

107 -

108 -

109 -* mo/cvs-server-updates (2012-12-09) 18 commits

110 - (merged to 'next' on 2013-01-08 at 75e2d11)

111 - + t9402: Use TABs for indentation

112 - + t9402: Rename check.cvsCount and check.list

113 - + t9402: Simplify git ls-tree

114 - + t9402: Add missing &&; Code style

115 - + t9402: No space after IO-redirection

116 - + t9402: Dont use test_must_fail cvs

117 - + t9402: improve check_end_tree() and check_end_full_tree()

118 - + t9402: sed -i is not portable

119 - + cvsserver Documentation: new cvs ... -r support

120 - + cvsserver: add t9402 to test branch and tag refs

121 - + cvsserver: support -r and sticky tags for most operations

122 - + cvsserver: Add version awareness to argsfromdir

123 - + cvsserver: generalize getmeta() to recognize commit refs

124 - + cvsserver: implement req_Sticky and related utilities

125 - + cvsserver: add misc commit lookup, file meta data, and file listing functions

126 - + cvsserver: define a tag name character escape mechanism

127 - + cvsserver: cleanup extra slashes in filename arguments

128 - + cvsserver: factor out git-log parsing logic

129 -

130 - Various git-cvsserver updates.

131 -

132 -

133 -* nd/retire-fnmatch (2013-01-01) 7 commits

134 - (merged to 'next' on 2013-01-07 at ab31f9b)

135 - + Makefile: add USE_WILDMATCH to use wildmatch as fnmatch

136 - + wildmatch: advance faster in <asterisk> + <literal> patterns

137 - + wildmatch: make a special case for "*/" with FNM_PATHNAME

138 - + test-wildmatch: add "perf" command to compare wildmatch and fnmatch

139 - + wildmatch: support "no FNM_PATHNAME" mode

140 - + wildmatch: make dowild() take arbitrary flags

141 - + wildmatch: rename constants and update prototype

142 -

143 - Replace our use of fnmatch(3) with a more feature-rich wildmatch.

144 - A handful patches at the bottom have been moved to nd/wildmatch to

145 - graduate as part of that branch, before this series solidifies.

146 -

147 -

148 -* rs/clarify-entry-cmp-sslice (2013-01-16) 1 commit

149 - (merged to 'next' on 2013-01-18 at d584dc6)

150 - + refs: use strncmp() instead of strlen() and memcmp()

151 -

22 --------------------------------------------------

23 [New Topics]

24

155 -* jc/push-reject-reasons (2013-01-24) 4 commits

156 - - push: finishing touches to explain REJECT_ALREADY_EXISTS better

157 - - push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

158 - - push: further simplify the logic to assign rejection reason

159 - - push: further clean up fields of "struct ref"

25 +* bc/git-p4-for-python-2.4 (2013-01-26) 2 commits

26 + - git-p4.py: support Python 2.4

27 + - git-p4.py: support Python 2.5

28

161 - Improve error and advice messages given locally when "git push"

162 - refuses when it cannot compute fast-forwardness by separating these

163 - cases from the normal "not a fast-forward; merge first and push

164 - again" case.

29 + With small updates to remove dependency on newer features of

30 + Python, keep git-p4 usable with older Python.

31

32 Will merge to 'next'.

33

34

169 -* as/test-cleanup (2013-01-24) 1 commit

170 - - t7102 (reset): don't hardcode SHA-1 in expected outputs

35 +* jk/gc-auto-after-fetch (2013-01-26) 1 commit

36 + - Merge branch 'jk/maint-gc-auto-after-fetch' into jk/gc-auto-after-fetch

37 + (this branch uses jk/maint-gc-auto-after-fetch.)

38 +

39 + This is to resolve merge conflicts early for the same topic to

40 + recent codebase.

41

42 Will merge to 'next'.

43

44

175 -* jc/do-not-let-random-file-interfere-with-completion-tests (2013-01-24) 1 commit

176 - - t9902: protect test from stray build artifacts

45 +* jk/maint-gc-auto-after-fetch (2013-01-26) 2 commits

46 + - fetch-pack: avoid repeatedly re-scanning pack directory

47 + - fetch: run gc --auto after fetching

48 + (this branch is used by jk/gc-auto-after-fetch.)

49

178 - Scripts to test bash completion was inherently flaky as it was

179 - affected by whatever random things the user may have on $PATH.

50 + Help "fetch only" repositories that does not trigger "gc --auto"

51 + often enough.

52

181 - Will merge to 'next'.

53 + Will merge to 'next' via jk/gc-auto-after-fetch.

54

55

184 -* jk/cvsimport-does-not-work-with-cvsps3 (2013-01-24) 1 commit

185 - - git-cvsimport.txt: cvsps-2 is deprecated

56 +* jk/read-commit-buffer-data-after-free (2013-01-26) 3 commits

57 + - logmsg_reencode: lazily load missing commit buffers

58 + - logmsg_reencode: never return NULL

59 + - commit: drop useless xstrdup of commit message

60

187 - Warn people that other tools are more recommendable over

188 - cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport

189 - will not work with cvsps3.

61 + Clarify the ownership rule for commit->buffer field, which some

62 + callers incorrectly accessed without making sure the data is

63 + available there.

64

65 Will merge to 'next'.

66

67

194 -* jk/mergetool (2013-01-25) 6 commits

195 - - mergetool--lib: Improve show_tool_help() output

196 - - mergetools/vim: Remove redundant diff command

197 - - git-difftool: use git-mergetool--lib for "--tool-help"

198 - - git-mergetool: don't hardcode 'mergetool' in show_tool_help

199 - - git-mergetool: remove redundant assignment

200 - - git-mergetool: move show_tool_help to mergetool--lib

68 +* pw/git-p4-on-cygwin (2013-01-26) 21 commits

69 + - git p4: introduce gitConfigBool

70 + - git p4: avoid shell when calling git config

71 + - git p4: avoid shell when invoking git config --get-all

72 + - git p4: avoid shell when invoking git rev-list

73 + - git p4: avoid shell when mapping users

74 + - git p4: disable read-only attribute before deleting

75 + - git p4 test: use test_chmod for cygwin

76 + - git p4: cygwin p4 client does not mark read-only

77 + - git p4 test: avoid wildcard * in windows

78 + - git p4 test: use LineEnd unix in windows tests too

79 + - git p4 test: newline handling

80 + - git p4: scrub crlf for utf16 files on windows

81 + - git p4: remove unreachable windows \r\n conversion code

82 + - git p4 test: translate windows paths for cygwin

83 + - git p4 test: start p4d inside its db dir

84 + - git p4 test: use client_view in t9806

85 + - git p4 test: avoid loop in client_view

86 + - git p4 test: use client_view to build the initial client

87 + - git p4: generate better error message for bad depot path

88 + - git p4: remove unused imports

89 + - git p4: temp branch name should use / even on windows

90 +

91 + Improve "git p4" on Cygwin. The cover letter said it is not yet

92 + ready for full Windows support so I won't move this to 'next' until

93 + told by the author (the area maintainer) otherwise.

94 +

95 +

96 +* ss/mergetools-tortoise (2013-01-26) 2 commits

97 + - mergetools: allow passing pathnames with SP in them to TortoiseGitMerge

98 + - mergetools: support TortoiseGitMerge

99 +

100 + Update mergetools to work better with newer merge helper tortoise ships.

101

202 - Cleans up mergetool/difftool combo.

102 + Will merge to 'next'.

103

204 - It seems John Keeping has some more updates but the version posted

205 - breaks the tests rather badly.

104

207 - Expecting some follow-ups.

105 +* da/mergetool-docs (2013-01-27) 4 commits

106 + - doc: generate a list of valid merge tools

107 + - mergetool--lib: add functions for finding available tools

108 + - mergetool--lib: improve the help text in guess_merge_tool()

109 + - mergetool--lib: simplify command expressions

110 + (this branch uses jk/mergetool.)

111

112 + Build on top of the clean-up done by jk/mergetool and automatically

113 + generate the list of mergetool and difftool backends the build

114 + supports to be included in the documentation.

115

210 -* jn/do-not-drop-username-when-reading-from-etc-mailname (2013-01-25) 1 commit

211 - - ident: do not drop username when reading from /etc/mailname

116 + This may still need to be fixed up at minor details; I'd like to

117 + see a review from John Keeping on these.

118

213 - We used to stuff "user@" and then append what we read from

214 - /etc/mailname to come up with a default e-mail ident, but a bug

215 - lost the "user@" part. This is to fix it.

119

217 - Will merge to 'next'.

120 +* nd/branch-error-cases (2013-01-27) 4 commits

121 + - branch: mark more strings for translation

122 + - branch: give a more helpful message on redundant arguments

123 + - branch: reject -D/-d without branch name

124 + - branch: no detached HEAD check when editing another branch's description

125

126 + Fix various error messages and conditions in "git branch", e.g. we

127 + advertised "branch -d/-D" to remove one or more branches but actually

128 + implemented removal of zero or more branches---request to remove no

129 + branches was not rejected.

130

220 -* mm/add-u-A-sans-pathspec (2013-01-25) 1 commit

221 - - add: warn when -u or -A is used without pathspec

222 -

223 - Forbid "git add -u" and "git add -A" without pathspec run from a

224 - subdirectory, to train people to type "." (or ":/") to make the

225 - choice of default does not matter.

226 -

227 - Will merge to 'next'.

131 + Will merge to 'next', perhaps after rebasing on an older base

132 + so that this can later be merged to the maintenance track.

133

134 --------------------------------------------------

135 [Stalled]

@@ -366,6 +271,81 @@ repositories listed at

271 --------------------------------------------------

272 [Cooking]

273

274 +* jc/push-reject-reasons (2013-01-24) 4 commits

275 + - push: finishing touches to explain REJECT_ALREADY_EXISTS better

276 + - push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCE

277 + - push: further simplify the logic to assign rejection reason

278 + - push: further clean up fields of "struct ref"

279 +

280 + Improve error and advice messages given locally when "git push"

281 + refuses when it cannot compute fast-forwardness by separating these

282 + cases from the normal "not a fast-forward; merge first and push

283 + again" case.

284 +

285 + Will merge to 'next'.

286 +

287 +

288 +* as/test-cleanup (2013-01-24) 1 commit

289 + - t7102 (reset): don't hardcode SHA-1 in expected outputs

290 +

291 + Will merge to 'next'.

292 +

293 +

294 +* jc/do-not-let-random-file-interfere-with-completion-tests (2013-01-24) 1 commit

295 + - t9902: protect test from stray build artifacts

296 +

297 + Scripts to test bash completion was inherently flaky as it was

298 + affected by whatever random things the user may have on $PATH.

299 +

300 + Will merge to 'next'.

301 +

302 +

303 +* jk/cvsimport-does-not-work-with-cvsps3 (2013-01-24) 1 commit

304 + - git-cvsimport.txt: cvsps-2 is deprecated

305 +

306 + Warn people that other tools are more recommendable over

307 + cvsimport+cvsps2 combo when doing a one-shot import, and cvsimport

308 + will not work with cvsps3.

309 +

310 + Will merge to 'next'.

311 +

312 +

313 +* jk/mergetool (2013-01-27) 8 commits

314 + - mergetools: simplify how we handle "vim" and "defaults"

315 + - mergetool--lib: don't call "exit" in setup_tool

316 + - mergetool--lib: improve show_tool_help() output

317 + - mergetools/vim: remove redundant diff command

318 + - git-difftool: use git-mergetool--lib for "--tool-help"

319 + - git-mergetool: don't hardcode 'mergetool' in show_tool_help

320 + - git-mergetool: remove redundant assignment

321 + - git-mergetool: move show_tool_help to mergetool--lib

322 + (this branch is used by da/mergetool-docs.)

323 +

324 + Cleans up mergetool/difftool combo.

325 +

326 + Will merge to 'next'.

327 +

328 +

329 +* jn/do-not-drop-username-when-reading-from-etc-mailname (2013-01-25) 1 commit

330 + - ident: do not drop username when reading from /etc/mailname

331 +

332 + We used to stuff "user@" and then append what we read from

333 + /etc/mailname to come up with a default e-mail ident, but a bug

334 + lost the "user@" part. This is to fix it.

335 +

336 + Will merge to 'next'.

337 +

338 +

339 +* mm/add-u-A-sans-pathspec (2013-01-25) 1 commit

340 + - add: warn when -u or -A is used without pathspec

341 +

342 + Forbid "git add -u" and "git add -A" without pathspec run from a

343 + subdirectory, to train people to type "." (or ":/") to make the

344 + choice of default does not matter.

345 +

346 + Will merge to 'next'.

347 +

348 +

349 * bc/fix-array-syntax-for-3.0-in-completion-bash (2013-01-18) 1 commit

350 (merged to 'next' on 2013-01-25 at d113c1a)

351 + git-completion.bash: replace zsh notation that breaks bash 3.X

@@ -373,6 +353,8 @@ repositories listed at

353 Fix use of an array notation that older versions of bash do not

354 understand.

355

356 + Will merge to 'master'.

357 +

358

359 * jc/help (2013-01-18) 1 commit

360 (merged to 'next' on 2013-01-25 at b2b087e)

@@ -381,6 +363,8 @@ repositories listed at

363 A header file that has the definition of a static array was

364 included in two places, wasting the space.

365

366 + Will merge to 'master'.

367 +

368

369 * jc/hidden-refs (2013-01-18) 2 commits

370 - upload-pack: allow hiding ref hiearchies

@@ -406,6 +390,8 @@ repositories listed at

390 Update tests that were expecting to fail due to a bug that was

391 fixed earlier.

392

393 + Will merge to 'master'.

394 +

395

396 * nd/magic-pathspec-from-root (2013-01-21) 2 commits

397 (merged to 'next' on 2013-01-25 at b056b57)

@@ -419,6 +405,8 @@ repositories listed at

405 rule so that ":/" (no other string before or after) is always

406 interpreted as a pathspec, to avoid having to say "git cmd -- :/".

407

408 + Will merge to 'master'.

409 +

410

411 * ta/doc-no-small-caps (2013-01-22) 10 commits

412 - fixup! Change 'git' to 'Git' whenever the whole system is referred to #4

@@ -454,6 +442,8 @@ repositories listed at

442 and size, which these implementations can reliably update. This

443 avoids excessive revalidation of contents.

444

445 + Will merge to 'master'.

446 +

447

448 * jc/remove-treesame-parent-in-simplify-merges (2013-01-17) 1 commit

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

@@ -466,10 +456,11 @@ repositories listed at

456 infrastructure, it is appreciated to have an extra set of eyes for

457 sanity check.

458

469 - Waiting for reviews and comments.

459 + Will merge to 'next'.

460

461

472 -* jk/remote-helpers-in-python-3 (2013-01-24) 8 commits

462 +* jk/remote-helpers-in-python-3 (2013-01-27) 9 commits

463 + - git-remote-testpy: fix path hashing on Python 3

464 (merged to 'next' on 2013-01-25 at acf9419)

465 + git-remote-testpy: call print as a function

466 + git-remote-testpy: don't do unbuffered text I/O

@@ -482,6 +473,8 @@ repositories listed at

473

474 Prepare remote-helper test written in Python to be run with Python3.

475

476 + Waiting for the final review and Ack, perhaps from Michael.

477 +

478

479 * dl/am-hg-locale (2013-01-18) 1 commit

480 (merged to 'next' on 2013-01-25 at 3419019)

@@ -491,6 +484,8 @@ repositories listed at

484 to an e-mail looking date using locale dependant strftime, causing

485 patch application to fail.

486

487 + Will merge to 'master'.

488 +

489

490 * jk/config-parsing-cleanup (2013-01-23) 8 commits

491 - reflog: use parse_config_key in config callback

@@ -609,7 +604,7 @@ repositories listed at

604 $gmane/211935

605

606

612 -* bc/append-signed-off-by (2013-01-21) 10 commits

607 +* bc/append-signed-off-by (2013-01-27) 11 commits

608 - Unify appending signoff in format-patch, commit and sequencer

609 - format-patch: update append_signoff prototype

610 - t4014: more tests about appending s-o-b lines

@@ -619,54 +614,9 @@ repositories listed at

614 - sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer

615 - t/t3511: add some tests of 'cherry-pick -s' functionality

616 - t/test-lib-functions.sh: allow to specify the tag name to test_commit

622 - - sequencer.c: remove broken support for rfc2822 continuation in footer

623 -

624 - Rerolled.

625 -

626 - Expecting another reroll.

627 - $gmane/214231

628 -

629 ---------------------------------------------------

630 -[Discarded]

631 -

632 -* er/replace-cvsimport (2013-01-12) 7 commits

633 - . t/lib-cvs: cvsimport no longer works without Python >= 2.7

634 - . t9605: test for cvsps commit ordering bug

635 - . t9604: fixup for new cvsimport

636 - . t9600: fixup for new cvsimport

637 - . t/lib-cvs.sh: allow cvsps version 3.x.

638 - . t/t960[123]: remove leftover scripts

639 - . cvsimport: rewrite to use cvsps 3.x to fix major bugs

640 -

641 - Rerolled as jc/cvsimport-upgrade.

642 -

643 -

644 -* jc/valgrind-memcmp-bsearch (2013-01-14) 1 commit

645 - . ignore memcmp() overreading in bsearch() callback

646 -

647 - Squelch false positive in valgrind tests; made unnecessary by

648 - rewriting the callsite that confuses the tool.

649 -

650 -

651 -* rs/archive-tar-config-parsing-fix (2013-01-14) 1 commit

652 - . archive-tar: fix sanity check in config parsing

653 -

654 - jk/config-parsing-cleanup made this topic unneeded.

655 -

617 + - commit, cherry-pick -s: remove broken support for multiline rfc2822 fields

618 + - sequencer.c: rework search for start of footer to improve clarity

619

657 -* jc/cvsimport-upgrade (2013-01-14) 8 commits

658 - - t9600: adjust for new cvsimport

659 - - t9600: further prepare for sharing

660 - - cvsimport-3: add a sample test

661 - - cvsimport: make tests reusable for cvsimport-3

662 - - cvsimport: start adding cvsps 3.x support

663 - - cvsimport: introduce a version-switch wrapper

664 - - cvsimport: allow setting a custom cvsps (2.x) program name

665 - - Makefile: add description on PERL/PYTHON_PATH

620 + Rerolled. With help from Jonathan, I think this is getting closer.

621

667 - People involved in cvsimport-3 say that the combination of it and

668 - cvsps3 does not work with incremental import all that well. For

669 - now, let's discard this and replace it with a documeentation update

670 - that says "cvsimport will not work if you do not have cvsps2".

622

672 - Will discard.

Whats cooking (2013/01 #10)