From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: What's cooking in git.git (Aug 2010, #04; Wed, 18) Date: Wed, 18 Aug 2010 15:27:32 -0700 Message-ID: <7vfwyb8skr.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 Thu Aug 19 00:27:46 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 1Olr6n-0004kL-3M for gcvg-git-2@lo.gmane.org; Thu, 19 Aug 2010 00:27:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754383Ab0HRW1k convert rfc822-to-quoted-printable (ORCPT ); Wed, 18 Aug 2010 18:27:40 -0400 Received: from a-pb-sasl-quonix.pobox.com ([208.72.237.25]:55696 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751895Ab0HRW1h convert rfc822-to-8bit (ORCPT ); Wed, 18 Aug 2010 18:27:37 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id F09EECEA9E; Wed, 18 Aug 2010 18:27:36 -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=gyOjRYRGEgUqM+20tK/eR1G4l yU=; b=jZaJrgG/Oxh4mDUXuXPkD+2GEHxNt+CJy9BkQ8D2SgLFrkax4vlJqeSnh owJKciMFeXKbCGX35XkQBDuZBYiJ0AFCVoQC9qOu5E3gVG2gkHXUA4DIJuq9gs+2 tCXCQH8x2RyEPqQwTm7QOP2jly9AREl51MmXbQcycIrsjMxad8= 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=um8i/z7cVPQpqrGGhKB Lw7Ma33pQby2BaAeCKyfZSmK7IqqUschg2x4SBWDWrKBSf/a2bYEi/+GOvhjx1dv NH8PI7yyihC4A/Sqmyz57rc07beClLxRJXG2CmbQwTlMpWV9ipsJt1l6fKP1lTjt Tp/mRyMoQtL7I0v8DM/J2E3w= Received: from a-pb-sasl-quonix. (unknown [127.0.0.1]) by a-pb-sasl-quonix.pobox.com (Postfix) with ESMTP id DA5D1CEA9D; Wed, 18 Aug 2010 18:27:35 -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 93876CEA9C; Wed, 18 Aug 2010 18:27:33 -0400 (EDT) X-master-at: bd3a97a27a97485b130802d497214be312b737f9 X-next-at: f88bdb1c315a588128fcf0b68cfd286e3e096110 User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) X-Pobox-Relay-ID: CD22EE78-AB17-11DF-871B-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. -------------------------------------------------- [Graduated to "master"] * ab/report-corrupt-object-with-type (2010-06-10) 1 commit (merged to 'next' on 2010-08-12 at 8a9e1d0) + sha1_file: Show the the type and path to corrupt objects * ar/string-list-foreach (2010-07-03) 2 commits (merged to 'next' on 2010-08-11 at 993dc02) + Convert the users of for_each_string_list to for_each_string_list_it= em macro + Add a for_each_string_list_item macro (this branch is used by tf/string-list-init.) * cc/find-commit-subject (2010-07-22) 6 commits (merged to 'next' on 2010-08-12 at ce38436) + blame: use find_commit_subject() instead of custom code + merge-recursive: use find_commit_subject() instead of custom code + bisect: use find_commit_subject() instead of custom code + revert: rename variables related to subject in get_message() + revert: refactor code to find commit subject in find_commit_subject(= ) + revert: fix off by one read when searching the end of a commit subje= ct * jc/maint-follow-rename-fix (2010-08-15) 3 commits (merged to 'next' on 2010-08-15 at 2f41ea8) + log: test for regression introduced in v1.7.2-rc0~103^2~2 (merged to 'next' on 2010-08-14 at 16706d6) + diff --follow: do call diffcore_std() as necessary + diff --follow: do not waste cycles while recursing * jh/clean-exclude (2010-07-20) 2 commits (merged to 'next' on 2010-08-12 at 9a63fd4) + Add test for git clean -e. + Add -e/--exclude to git-clean. * jh/graph-next-line (2010-07-13) 2 commits (merged to 'next' on 2010-08-11 at 333f9df) + Enable custom schemes for column colors in the graph API + Make graph_next_line() available in the graph.h API * jh/use-test-must-fail (2010-07-20) 1 commit (merged to 'next' on 2010-08-12 at 16d4e11) + Convert "! git" to "test_must_fail git" * jl/submodule-ignore-diff (2010-08-06) 4 commits (merged to 'next' on 2010-08-12 at ffe84bb) + Add tests for the diff.ignoreSubmodules config option + Add the 'diff.ignoreSubmodules' config setting + Submodules: Use "ignore" settings from .gitmodules too for diff and = status + Submodules: Add the new "ignore" config option for diff and status * jn/fast-import-subtree (2010-06-30) 1 commit (merged to 'next' on 2010-08-11 at 5e19de0) + Teach fast-import to import subtrees named by tree id * jn/fix-abbrev (2010-07-27) 3 commits (merged to 'next' on 2010-08-12 at 2cf70df) + examples/commit: use --abbrev for commit summary + checkout, commit: remove confusing assignments to rev.abbrev + archive: abbreviate substituted commit ids again * jn/maint-plug-leak (2010-08-09) 3 commits (merged to 'next' on 2010-08-14 at ec2ba20) + write-tree: Avoid leak when index refers to an invalid object + read-tree: stop leaking tree objects + core: Stop leaking ondisk_cache_entrys * jn/rebase-rename-am (2008-11-10) 5 commits (merged to 'next' on 2010-08-12 at a6d25c4) + rebase: protect against diff.renames configuration + t3400 (rebase): whitespace cleanup + Teach "apply --index-info" to handle rename patches + t4150 (am): futureproof against failing tests + t4150 (am): style fix * kf/post-receive-sample-hook (2010-07-16) 1 commit (merged to 'next' on 2010-08-12 at 9b7e3c9) + post-receive-email: optional message line count limit I do not particularly like the idea of counting number of lines in a sh= ell loop but this is an opt-in feature to a contrib/ item so it should be o= k. * ml/rebase-x-strategy (2010-07-29) 1 commit (merged to 'next' on 2010-08-12 at 0aa2fdb) + rebase: support -X to pass through strategy options * tc/checkout-B (2010-08-10) 4 commits (merged to 'next' on 2010-08-11 at 5433b51) + builtin/checkout: handle -B from detached HEAD correctly + builtin/checkout: learn -B + builtin/checkout: reword hint for -b + add tests for checkout -b * tf/string-list-init (2010-07-04) 1 commit (merged to 'next' on 2010-08-14 at 193b4db) + string_list: Add STRING_LIST_INIT macro and make use of it. * tr/xsize-bits (2010-07-28) 1 commit (merged to 'next' on 2010-08-11 at bcc0271) + xsize_t: check whether we lose bits * vs/doc-spell (2010-07-20) 1 commit (merged to 'next' on 2010-08-12 at 3fbd06c) + Documentation: spelling fixes -------------------------------------------------- [New Topics] * ab/maint-reset-mixed-w-pathspec-advice (2010-08-15) 1 commit - reset: Better warning message on git reset --mixed Probably needs a "better" title; the commit shouldn't advertise itself being "better" (or "clean" for that matter), but say what it changed an= d leave it to the readers to judge if it is better. * cb/binary-patch-id (2010-08-15) 1 commit - 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 - 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 - 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) 5 commits - autoconf: don't use platform regex if it lacks REG_STARTEND - t/t7008-grep-binary.sh: un-TODO a test that needs REG_STARTEND - 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-18) 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.) Not merged to 'pu' as it seemed to have broken something. * da/fix-submodule-sync-superproject-config (2010-08-18) 1 commit - submodule sync: Update "submodule..url" Looked reasonable; will merge to 'next' soonish. * jn/update-contrib-example-merge (2010-08-17) 25 commits - mergetool: Skip autoresolved paths - 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