From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: What's cooking in git.git (Aug 2010, #05; Sat, 21) Date: Sun, 22 Aug 2010 00:30:00 -0700 Message-ID: <7v4oen5clj.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Aug 22 09:30:16 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 1On50R-0005GJ-Tz for gcvg-git-2@lo.gmane.org; Sun, 22 Aug 2010 09:30:16 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751847Ab0HVHaK convert rfc822-to-quoted-printable (ORCPT ); Sun, 22 Aug 2010 03:30:10 -0400 Received: from a-pb-sasl-quonix.pobox.com ([208.72.237.25]:38066 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751485Ab0HVHaH convert rfc822-to-8bit (ORCPT ); Sun, 22 Aug 2010 03:30:07 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id E3DDFCD8B4; Sun, 22 Aug 2010 03:30:06 -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 :content-transfer-encoding; s=sasl; bh=NfDn6C4EMbPs7sFWW5vmXknxi lQ=; b=Ckx/x+V6FweMlWJVN/V6opRnT4DArsK25bT/k/MyR5+pcnzVh5Gjth9Do b7LPUPm7PSUifiN5KcSRowo2oFwdzaOgt+uylE56ei0FkXAuiPpDqaCm60IrmMpQ 6IlkHaQ2hefkuc5N14pSivT4JY+SiroAI7ov/Tg5AUVWB0L4RE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=to:subject:from :date:message-id:mime-version:content-type :content-transfer-encoding; q=dns; s=sasl; b=NchIQZv9eMUBiWgYCYO Ijh7/lmNQ8ss5J6BZBUnmD6wVRZ/qhdAaQTSt/lxP3Q2xjizm2cOavLHdS3JVYiW mN6t+bNF8aas4DmAbk/hT22ABpdG/KxKj6Nef3tK6QnotLdXi4pkTnkHxIXLKB6T 1MuOJ8Vsbqh2PP4XfVNdjCKU= Received: from a-pb-sasl-quonix. (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id B3B31CD8AF; Sun, 22 Aug 2010 03:30:05 -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 57A48CD8A7; Sun, 22 Aug 2010 03:30:03 -0400 (EDT) X-master-at: 5cba1229d8246da2a6d1d956eeed8227f69e185b X-next-at: 5af700393e003167b0b86690fd4132ebfc677088 User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) X-Pobox-Relay-ID: 15952FBE-ADBF-11DF-BE7F-9056EE7EF46B-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. I'm very tempted to propose for us to start slowing down and release 1.= 7.3 mid-September with a polished version of what is in 'next'. Please exp= ect another pre-release freeze soon. -------------------------------------------------- [Graduated to "master"] * ab/perl-install (2010-08-03) 1 commit (merged to 'next' on 2010-08-14 at f2a27ee) + perl/Makefile: Unset INSTALL_BASE when making perl.mak * dg/local-mod-error-messages (2010-08-11) 5 commits (merged to 'next' on 2010-08-14 at e684ca8) + t7609: test merge and checkout error messages + unpack_trees: group error messages by type + merge-recursive: distinguish "removed" and "overwritten" messages + merge-recursive: porcelain messages for checkout + Turn unpack_trees_options.msgs into an array + enum * en/rebase-against-rebase-fix (2010-08-12) 2 commits (merged to 'next' on 2010-08-14 at 1dea7b9) + pull --rebase: Avoid spurious conflicts and reapplying unnecessary p= atches + t5520-pull: Add testcases showing spurious conflicts from git pull -= -rebase * gb/split-cmdline-errmsg (2010-08-07) 1 commit (merged to 'next' on 2010-08-14 at 41146ff) + split_cmdline: Allow caller to access error string * hv/submodule-find-ff-merge (2010-07-07) 3 commits (merged to 'next' on 2010-08-11 at 6900d2c) + Implement automatic fast-forward merge for submodules + setup_revisions(): Allow walking history in a submodule + Teach ref iteration module about submodules * mm/rebase-i-exec (2010-08-13) 4 commits (merged to 'next' on 2010-08-14 at 17620dc) + git-rebase--interactive.sh: use printf instead of echo to print comm= it message + git-rebase--interactive.sh: rework skip_unnecessary_picks (merged to 'next' on 2010-08-12 at 377e3f0) + test-lib: user-friendly alternatives to test [-d|-f|-e] + rebase -i: add exec command to launch a shell command * mm/shortopt-detached (2010-08-05) 5 commits (merged to 'next' on 2010-08-12 at 35ceb98) + log: parse separate option for --glob + log: parse separate options like git log --grep foo + diff: parse separate options --stat-width n, --stat-name-width n + diff: split off a function for --stat-* option parsing + diff: parse separate options like -S foo * nd/fix-sparse-checkout (2010-07-31) 5 commits (merged to 'next' on 2010-08-12 at 4f7a3b9) + unpack-trees: mark new entries skip-worktree appropriately + unpack-trees: do not check for conflict entries too early + unpack-trees: let read-tree -u remove index entries outside sparse a= rea + unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is a= lways set + t1011 (sparse checkout): style nitpicks * po/userdiff-csharp (2010-08-16) 1 commit (merged to 'next' on 2010-08-18 at f5edb3a) + Userdiff patterns for C# * so/http-user-agent (2010-08-11) 1 commit (merged to 'next' on 2010-08-12 at 86cc5c4) + Allow HTTP user agent string to be modified. * sr/local-config (2010-08-03) 1 commit (merged to 'next' on 2010-08-12 at 431f7af) + config: add --local option -------------------------------------------------- [New Topics] * jn/maint-doc-user-manual-html-doctype (2010-08-21) 2 commits - docs: fix Makefile dependency for user manual - Documentation: set a !DOCTYPE for user manual * cb/maint-mergetool-no-tty (2010-08-20) 1 commit - mergetool: Remove explicit references to /dev/tty * jn/doc-backslash (2010-08-20) 17 commits - 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 * nd/clone-depth-zero (2010-08-20) 3 commits - {fetch,upload}-pack: allow --depth=3D0 for infinite depth - fetch-pack: use args.shallow to detect shallow clone instead of args= =2Edepth - clone: do not accept --depth on local clones * cb/ignored-paths-are-precious (2010-08-21) 1 commit - checkout/merge: optionally fail operation when ignored files need to= be overwritten I fixed up a trivial error in the configuration parser (which didn't return immediately after parsing), and while at it flipped the default=20 value of the configuration and the command line option to false. This probably needs tests; also we know of longstanding bugs in related area that needs to be addressed---they do not have to be part of this series but their reproduction recipe would belong to the test script fo= r this topic. * np/maint-huge-delta-generation (2010-08-21) 1 commit (merged to 'next' on 2010-08-21 at 5af7003) + fix >4GiB source delta assertion failure -------------------------------------------------- [Stalled] * jc/log-grep (2010-07-19) 1 commit - git log: add -G that greps in the patch text This is broken, but haven't found any time to revisit it yet. * zl/mailinfo-recode-patch (2010-06-14) 2 commits - add --recode-patch option to git-am - add --recode-patch option to git-mailinfo I recall there was another round of re-roll planned for this one. * jk/tag-contains (2010-07-05) 4 commits - Why is "git tag --contains" so slow? - default core.clockskew variable to one day - limit "contains" traversals based on commit timestamp - tag: speed up --contains calculation -------------------------------------------------- [Cooking] * jn/apply-filename-with-sp (2010-08-18) 3 commits - apply: handle traditional patches with space in filename - tests: exercise "git apply" with weird filenames - apply: split quoted filename handling into new function * ab/maint-reset-mixed-w-pathspec-advice (2010-08-15) 1 commit (merged to 'next' on 2010-08-21 at b09ee46) + reset: suggest what to do upon "git reset --mixed " Retitled. * cb/binary-patch-id (2010-08-15) 1 commit (merged to 'next' on 2010-08-21 at ff38c3e) + hash binary sha1 into patch id * jj/icase-directory (2010-08-16) 6 commits - Support case folding in git fast-import when core.ignorecase=3Dtrue - Support case folding for git add when core.ignorecase=3Dtrue - Add case insensitivity support when using git ls-files - Add case insensitivity support for directories when using git status - Case insensitivity support for .gitignore via core.ignorecase - Add string comparison functions that respect the ignore_case variabl= e. Depends on GNU extension to fnmatch(3). * jn/cherry-revert-message-clean-up (2010-08-18) 5 commits (merged to 'next' on 2010-08-21 at 09b123c) + tests: fix syntax error in "Use advise() for hints" test + cherry-pick/revert: Use advise() for hints + cherry-pick/revert: Use error() for failure message + Introduce advise() to print hints + Eliminate =E2=80=9CFinished cherry-pick/revert=E2=80=9D message (this branch uses cc/revert.) * jn/merge-custom-no-trivial (2010-08-15) 2 commits (merged to 'next' on 2010-08-21 at 674498b) + merge: let custom strategies intervene in trivial merges + t7606 (merge-theirs): modernize style * po/etc-gitattributes (2010-08-16) 1 commit - Add global and system-wide gitattributes * ab/compat-regex (2010-08-17) 7 commits (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 * ab/test-1 (2010-08-19) 5 commits - 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) an= d ../ - Merge branch 'ab/i18n' into ab/test-1 (this branch uses ab/i18n and ab/test.) * da/fix-submodule-sync-superproject-config (2010-08-18) 1 commit (merged to 'next' on 2010-08-21 at e96772a) + submodule sync: Update "submodule..url" * 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