From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: What's cooking in git.git (Sep 2010, #02; Mon, 6) Date: Mon, 06 Sep 2010 00:41:11 -0700 Message-ID: <7v1v97uxns.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon Sep 06 09:41:29 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OsWKV-0004gD-6c for gcvg-git-2@lo.gmane.org; Mon, 06 Sep 2010 09:41:27 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752228Ab0IFHlV (ORCPT ); Mon, 6 Sep 2010 03:41:21 -0400 Received: from a-pb-sasl-quonix.pobox.com ([208.72.237.25]:62606 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752197Ab0IFHlT (ORCPT ); Mon, 6 Sep 2010 03:41:19 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id BDE77D31C6; Mon, 6 Sep 2010 03:41:16 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=to:subject :from:date:message-id:mime-version:content-type; s=sasl; bh=assh k0NIR/JUEpD7Z6GxdPLAhfA=; b=n6iuBgpZuIMcxj0bW2a2MqWPWSoVx0MgHwZo ITx8U9f7e15Ica50EuEVuLA5RamdKLCd/nj9eTRnZbsdj8ntGlFSsXmi3scu4pBN 39jLyyoKO8A7pna24YQkB8EHDsQwBNmvjbW/LC1GllnL+8peaXXeqdmy9gTRcRGj HjW//mc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=to:subject:from :date:message-id:mime-version:content-type; q=dns; s=sasl; b=scN iT6twbDQfA47a5myiXW3GkcbakjEhTcsuBEAN2XBvpORCg9a0+lmLqEj6TDPIwnZ S2Ht2yKvKPAfNntMJcq61BtKPJSpgFjJDN4sS5PeqZQqwpeG59nh43AnrBsbsIM4 /Od6mnLLqdr2kQjyN7ZbaX0YZtIJbY7N6u3UXWbo= Received: from a-pb-sasl-quonix. (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id AAC9ED31C5; Mon, 6 Sep 2010 03:41:15 -0400 (EDT) Received: from pobox.com (unknown [76.102.252.155]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 4AA48D31C4; Mon, 6 Sep 2010 03:41:13 -0400 (EDT) X-master-at: 4682693e9ccc04252d0fad6f5627fc056abcdbba X-next-at: dbf0d4b6cc543fc5bf9b1b20149324fff6736c38 User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) X-Pobox-Relay-ID: 211F2818-B98A-11DF-95FC-030CEE7EF46B-77302942!a-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. There are a few leftover bits in 'next' that need to be merged to 'master' before we declare a real -rc cycle, so tonight's pushout is -rc0. -------------------------------------------------- [Graduated to "master"] * ab/compat-regex (2010-08-26) 9 commits (merged to 'next' on 2010-08-26 at c5cc9d2) + Fix compat/regex ANSIfication on MinGW (merged to 'next' on 2010-08-22 at 40bce7c) + autoconf: regex library detection typofix (merged to 'next' on 2010-08-21 at 632d60f) + autoconf: don't use platform regex if it lacks REG_STARTEND + t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND + compat/regex: get rid of old-style definition + compat/regex: define out variables only used under RE_ENABLE_I18N + Change regerror() declaration from K&R style to ANSI C (C89) + compat/regex: get the gawk regex engine to compile within git + compat/regex: use the regex engine from gawk for compat This may need a yet another fix-up for MinGW. * ab/test-2 (2010-08-30) 51 commits (merged to 'next' on 2010-08-31 at 9d56f47) + tests: factor HOME=$(pwd) in test-lib.sh + test-lib: use subshell instead of cd $new && .. && cd $old + tests: simplify "missing PREREQ" message + t/t0000-basic.sh: Run the passing TODO test inside its own test-lib + test-lib: Allow overriding of TEST_DIRECTORY + test-lib: Use "$GIT_BUILD_DIR" instead of "$TEST_DIRECTORY"/../ + test-lib: Use $TEST_DIRECTORY or $GIT_BUILD_DIR instead of $(pwd) and ../ + test: Introduce $GIT_BUILD_DIR (merged to 'next' on 2010-08-18 at f88bdb1) + cvs tests: do not touch test CVS repositories shipped with source + t/t9602-cvsimport-branches-tags.sh: Add a PERL prerequisite + t/t9601-cvsimport-vendor-branch.sh: Add a PERL prerequisite + t/t7105-reset-patch.sh: Add a PERL prerequisite + t/t9001-send-email.sh: convert setup code to tests + t/t9001-send-email.sh: change from skip_all=* to prereq skip + t/t9001-send-email.sh: Remove needless PROG=* assignment + t/t9600-cvsimport.sh: change from skip_all=* to prereq skip + lib-patch-mode tests: change from skip_all=* to prereq skip + t/t3701-add-interactive.sh: change from skip_all=* to prereq skip + tests: Move FILEMODE prerequisite to lib-prereq-FILEMODE.sh + t/Makefile: Create test-results dir for smoke target + git-notes: Run partial expensive test everywhere + t/t3300-funny-names: change from skip_all=* to prereq skip + t/t3902-quoted: change from skip_all=* to prereq skip + t/t4016-diff-quote: change from skip_all=* to prereq skip + t/t5503-tagfollow: change from skip_all=* to prereq skip + t/t7005-editor: change from skip_all=* to prereq skip + t/t5705-clone-2gb: change from skip_all=* to prereq skip + t/t1304-default-acl: change from skip_all=* to prereq skip + t/README: Update "Skipping tests" to align with best practices + t/t7800-difftool.sh: Skip with prereq on no PERL + t/t5800-remote-helpers.sh: Skip with prereq on python <2.4 + t/t4004-diff-rename-symlink.sh: use three-arg + tests: implicitly skip SYMLINKS tests using + Makefile: make gcov invocation configurable + t/README: Add a note about the dangers of coverage chasing + t/README: A new section about test coverage + Makefile: Add cover_db_html target + Makefile: Add cover_db target + Makefile: Split out the untested functions target + Makefile: Include subdirectories in "make cover" reports + gitignore: Ignore files generated by "make coverage" + t/README: Add SMOKE_{COMMENT,TAGS}= to smoke_report target + t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh + t/README: Document the Smoke testing + tests: Infrastructure for Git smoke testing + test-lib: Multi-prereq support only checked the last prereq + tests: A SANITY test prereq for testing if we're root + t/README: Document the predefined test prerequisites + test-lib: Print missing prerequisites in test output + test-lib: Add support for multiple test prerequisites + test-lib: Don't write test-results when HARNESS_ACTIVE * cb/maint-mergetool-no-tty (2010-08-20) 1 commit (merged to 'next' on 2010-08-26 at b14989a) + mergetool: Remove explicit references to /dev/tty * eb/double-convert-before-merge (2010-07-02) 3 commits + Don't expand CRLFs when normalizing text during merge + Try normalizing files to avoid delete/modify conflicts when merging + Avoid conflicts when merging branches with mixed normalization (this branch is used by jf/merge-ignore-ws and jn/merge-renormalize.) * jc/maint-doc-em-dash (2010-08-23) 1 commit (merged to 'next' on 2010-08-24 at 2e4d30b) + Work around em-dash handling in newer AsciiDoc * jl/submodule-ignore-diff (2010-08-28) 3 commits (merged to 'next' on 2010-08-31 at 4f21f92) + checkout: Use submodule.*.ignore settings from .git/config and .gitmodules + checkout: Add test for diff.ignoreSubmodules (merged to 'next' on 2010-08-26 at af1c819) + checkout: respect diff.ignoreSubmodules setting * jn/apply-filename-with-sp (2010-08-18) 3 commits (merged to 'next' on 2010-08-26 at 4f60840) + apply: handle traditional patches with space in filename + tests: exercise "git apply" with weird filenames + apply: split quoted filename handling into new function * jn/doc-backslash (2010-08-20) 17 commits (merged to 'next' on 2010-08-23 at 8c364b2) + Documentation: remove stray backslash in show-branch discussion + Documentation: remove stray backslashes from "Fighting regressions" article + Documentation: do not convert ... operator to ellipses + Documentation: avoid stray backslash in user manual + Documentation: avoid stray backslashes in core tutorial + Documentation: remove stray backslashes in rev-parse manual + Documentation: remove backslash before ~ in fast-import manual + Documentation: remove stray backslash from "git bundle" manual + Documentation/technical: avoid stray backslash in parse-options API docs + Documentation: remove backslashes in manpage synopses + Documentation: clarify quoting in gitignore docs + Documentation: clarify quoting in "git rm" example + Documentation: add missing quotes to "git grep" examples + Documentation: clarify quoting in "git add" example + Documentation: unbreak regex in show-ref manual + Documentation: quoting trouble in "git rm" discussion + Documentation: tweak description of log.date * jn/maint-doc-user-manual-html-doctype (2010-08-21) 2 commits (merged to 'next' on 2010-08-26 at e9084af) + docs: fix Makefile dependency for user manual + Documentation: set a !DOCTYPE for user manual * jn/merge-custom-no-trivial (2010-08-23) 3 commits (merged to 'next' on 2010-08-24 at d9e5b2d) + t7606: Avoid using head as a file name (merged to 'next' on 2010-08-21 at 674498b) + merge: let custom strategies intervene in trivial merges + t7606 (merge-theirs): modernize style * jn/merge-renormalize (2010-08-05) 12 commits (merged to 'next' on 2010-08-18 at d9aa77b) + merge-recursive --renormalize + rerere: never renormalize + rerere: migrate to parse-options API + t4200 (rerere): modernize style + ll-merge: let caller decide whether to renormalize + ll-merge: make flag easier to populate + Documentation/technical: document ll_merge + merge-trees: let caller decide whether to renormalize + merge-trees: push choice to renormalize away from low level + t6038 (merge.renormalize): check that it can be turned off + t6038 (merge.renormalize): try checkout -m and cherry-pick + t6038 (merge.renormalize): style nitpicks (this branch is used by jf/merge-ignore-ws and jf/merge-ignore-ws; uses eb/double-convert-before-merge.) * jn/update-contrib-example-merge (2010-08-17) 24 commits (merged to 'next' on 2010-08-21 at 41b5c4d) + merge script: learn --[no-]rerere-autoupdate + merge script: notice @{-1} shorthand + merge script: handle --no-ff --no-commit correctly + merge script: --ff-only to disallow true merge + merge script: handle many-way octopus + merge script: handle -m --log correctly + merge script: forbid merge -s index + merge script: allow custom strategies + merge script: merge -X