From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: What's cooking in git.git (Dec 2009, #01; Tue, 01) Date: Tue, 01 Dec 2009 14:10:26 -0800 Message-ID: <7vaay2tkfh.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 Tue Dec 01 23:10:44 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1NFavh-0005oD-Pj for gcvg-git-2@lo.gmane.org; Tue, 01 Dec 2009 23:10:42 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753362AbZLAWK2 (ORCPT ); Tue, 1 Dec 2009 17:10:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753319AbZLAWK2 (ORCPT ); Tue, 1 Dec 2009 17:10:28 -0500 Received: from a-pb-sasl-sd.pobox.com ([64.74.157.62]:48490 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752430AbZLAWK1 (ORCPT ); Tue, 1 Dec 2009 17:10:27 -0500 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by a-pb-sasl-sd.pobox.com (Postfix) with ESMTP id 1D6F6A3EFD; Tue, 1 Dec 2009 17:10:32 -0500 (EST) 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=WuD0 z6goTgo1lAhDYq8Rt2IHIfo=; b=F1IKkj38l9h1+n3zX0xwYJEfH4zwQeDyGHlN 9Cb2Hec78MsGB5bqTP+iLpPis1gRZxOEoj/cyU3khgKW1R1fI93ulM6ZDqRduVqZ K0UrivxBx0kDecamn/LQOmry2Ude3Jgz/PCSSZGj1x/Q64Xil/vaIZQ+yv3Ks2Hr AO3s6dM= 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=ut7 KxPK8OCnj32EGMmslGq+WSNEuYPyDrmTquQ2bLWT4FkbIKB6Wy7PsL2iOVlExIsf 0yRNJvhWxuQT7gSXVcMmLg6aW3rwMaLqXzTFcShWcUxDIB40sYOGtJavQXJBRTvL ny1oBQkXbZKInm+euziV+iQcEnGeaAoRTj2uFWOM= Received: from a-pb-sasl-sd.pobox.com (unknown [127.0.0.1]) by a-pb-sasl-sd.pobox.com (Postfix) with ESMTP id 0CE14A3EFC; Tue, 1 Dec 2009 17:10:31 -0500 (EST) Received: from pobox.com (unknown [68.225.240.211]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by a-pb-sasl-sd.pobox.com (Postfix) with ESMTPSA id B8897A3EF9; Tue, 1 Dec 2009 17:10:28 -0500 (EST) X-master-at: c86485dd15d54fc6ff2cd0dda3b2a9faa4f2d66e X-next-at: e913581093e7da8bef58b143c6da65c845d9fea3 User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) X-Pobox-Relay-ID: 56DFAB8E-DEC6-11DE-8CFB-EF34BBB5EC2E-77302942!a-pb-sasl-sd.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: I am this close to actually tagging 1.6.6-rc1, but I am reasonably sure that I missed and did not pick up a few important fixes that should go into it, so here is the current status. What's cooking in git.git (Dec 2009, #01; Tue, 01) -------------------------------------------------- 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. In 1.7.0, we plan to correct handful of warts in the interfaces everybody agrees that they were mistakes. The resulting system may not be strictly backward compatible. Currently planned changes are: * refuse push to update the checked out branch in a non-bare repo by default Make "git push" into a repository to update the branch that is checked out fail by default. You can countermand this default by setting a configuration variable in the receiving repository. http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 * refuse push to delete the current branch by default Make "git push $there :$killed" to delete the branch that is pointed at by its HEAD fail by default. You can countermand this default by setting a configuration variable in the receiving repository. http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936 * "git send-email" won't make deep threads by default Many people said that by default when sending more than 2 patches the threading git-send-email makes by default is hard to read, and they prefer the default be one cover letter and each patch as a direct follow-up to the cover letter. You can countermand this by setting a configuration variable. http://article.gmane.org/gmane.comp.version-control.git/109790 * "git status" won't be "git-commit --dry-run" anymore http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993 * "git diff -w --exit-code" will exit success if only differences it found are whitespace changes that are stripped away from the output. http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751 * "git diff -w/-b" won't even produce "diff --git" header when all changes are about whitespaces. http://thread.gmane.org/gmane.comp.version-control.git/133256 -------------------------------------------------- [Graduated to "master"] * fc/maint-format-patch-pathspec-dashes (2009-11-26) 2 commits. + format-patch: add test for parsing of "--" + format-patch: fix parsing of "--" on the command line * bw/diff-color-hunk-header (2009-11-27) 2 commits (merged to 'next' on 2009-11-29 at c446977) + Give the hunk comment its own color (merged to 'next' on 2009-11-27 at 42ab131) + emit_line(): don't emit an empty followed by a newline * jc/maint-am-keep (2009-11-27) 1 commit. (merged to 'next' on 2009-11-27 at 7663874) + Remove dead code from "git am" * ns/send-email-no-chain-reply-to (2009-11-29) 1 commit + prepare send-email for smoother change of --chain-reply-to default (this branch is used by ns/1.7.0-send-email-no-chain-reply-to.) This starts warning about the change to --no-chain-reply-to in 1.7.0 for smoother transition. * uk/maint-shortlog-encoding (2009-11-25) 1 commit. - shortlog: respect commit encoding * fc/send-email-envelope (2009-11-26) 2 commits. (merged to 'next' on 2009-11-27 at 2d0257d) + send-email: automatic envelope sender + t9001: test --envelope-sender option of send-email * jc/mailinfo-remove-brackets (2009-07-15) 1 commit. (merged to 'next' on 2009-11-25 at 09d498f) + mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker Jim Meyering sent a patch to do a subset of what this does; to allow keeping '[SECURITY]' when the subject says '[SECURITY][PATCH]', you need to also teach "am" to pass the new -b option, but that is independent of what Jim showed the need in real-world, so I think this can go in as-is. * jn/gitweb-blame (2009-11-24) 8 commits. (merged to 'next' on 2009-11-25 at 0a5b649) + gitweb.js: fix padLeftStr() and its usage + gitweb.js: Harden setting blamed commit info in incremental blame + gitweb.js: fix null object exception in initials calculation + gitweb: Minify gitweb.js if JSMIN is defined + gitweb: Create links leading to 'blame_incremental' using JavaScript (merged to 'next' on 2009-10-11 at 73c4a83) + gitweb: Colorize 'blame_incremental' view during processing + gitweb: Incremental blame (using JavaScript) + gitweb: Add optional "time to generate page" info in footer With two more changes to disable this by default to make it suitable as "new feature with known breakages" for 1.6.6 * em/commit-claim (2009-11-04) 1 commit (merged to 'next' on 2009-11-23 at b5df6fd) + commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author * cc/bisect-doc (2009-11-08) 1 commit (merged to 'next' on 2009-11-27 at c46d648) + Documentation: add "Fighting regressions with git bisect" article * jc/pretty-lf (2009-10-04) 1 commit. (merged to 'next' on 2009-11-27 at 73651c4) + Pretty-format: %[+-]x to tweak inter-item newlines -------------------------------------------------- [New Topics] * ap/merge-backend-opts (2008-07-18) 6 commits - Document that merge strategies can now take their own options - Extend merge-subtree tests to test -Xsubtree=dir. - Make "subtree" part more orthogonal to the rest of merge-recursive. - Teach git-pull to pass -X