From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: [PATCH 7/7 (v2)] checkout -: make "-" to mean "previous branch" everywhere Date: Sat, 21 Mar 2009 17:58:20 -0700 Message-ID: <7vskl69xw3.fsf_-_@gitster.siamese.dyndns.org> References: <1237673619-12608-1-git-send-email-gitster@pobox.com> <1237673619-12608-2-git-send-email-gitster@pobox.com> <1237673619-12608-3-git-send-email-gitster@pobox.com> <1237673619-12608-4-git-send-email-gitster@pobox.com> <1237673619-12608-5-git-send-email-gitster@pobox.com> <1237673619-12608-6-git-send-email-gitster@pobox.com> <1237673619-12608-7-git-send-email-gitster@pobox.com> <1237673619-12608-8-git-send-email-gitster@pobox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sun Mar 22 01:59:57 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LlC2e-0003qI-Rf for gcvg-git-2@gmane.org; Sun, 22 Mar 2009 01:59:57 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752055AbZCVA62 (ORCPT ); Sat, 21 Mar 2009 20:58:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751746AbZCVA61 (ORCPT ); Sat, 21 Mar 2009 20:58:27 -0400 Received: from a-sasl-quonix.sasl.smtp.pobox.com ([208.72.237.25]:63365 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751368AbZCVA60 (ORCPT ); Sat, 21 Mar 2009 20:58:26 -0400 Received: from localhost.localdomain (unknown [127.0.0.1]) by a-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTP id A05D7899C; Sat, 21 Mar 2009 20:58:23 -0400 (EDT) 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-sasl-quonix.sasl.smtp.pobox.com (Postfix) with ESMTPSA id 0345A899B; Sat, 21 Mar 2009 20:58:21 -0400 (EDT) In-Reply-To: <1237673619-12608-8-git-send-email-gitster@pobox.com> (Junio C. Hamano's message of "Sat, 21 Mar 2009 15:13:39 -0700") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-Pobox-Relay-ID: 8B4C2D38-167C-11DE-B5A0-C5D912508E2D-77302942!a-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This is iffy, in that it teaches the very low level machinery to interpret it as "the tip of the previous branch" when "-" is fed to it, and has a high risk of unintended side effects. This makes "git log ..-" to work as expected, which is marginally useful because the revision parameter parser misinterprets the other direction "git log -..". It also makes "git check-ref-format --branch -" to work, which is not very useful because Porcelains can always ask for @{-1}. It also makes a refname whose last component is "-" forbidden. Signed-off-by: Junio C Hamano --- builtin-checkout.c | 8 +++++--- refs.c | 3 +++ sha1_name.c | 21 +++++++++++++-------- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/builtin-checkout.c b/builtin-checkout.c index 66df0c0..6b3b450 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -666,9 +666,11 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) arg = argv[0]; has_dash_dash = (argc > 1) && !strcmp(argv[1], "--"); - if (!strcmp(arg, "-")) - arg = "@{-1}"; - + { + struct strbuf sb = STRBUF_INIT; + strbuf_branchname(&sb, arg); + arg = strbuf_detach(&sb, NULL); + } if (get_sha1(arg, rev)) { if (has_dash_dash) /* case (1) */ die("invalid reference: %s", arg); diff --git a/refs.c b/refs.c index e355489..7e27537 100644 --- a/refs.c +++ b/refs.c @@ -735,6 +735,9 @@ int check_ref_format(const char *ref) if (!ch) { if (ref <= cp - 2 && cp[-2] == '.') return CHECK_REF_FORMAT_ERROR; + if (ref <= cp - 2 && cp[-2] == '-' && + (cp - 3 < ref || cp[-3] == '/')) + return CHECK_REF_FORMAT_ERROR; if (level < 2) return CHECK_REF_FORMAT_ONELEVEL; return ret; diff --git a/sha1_name.c b/sha1_name.c index 904bcd9..3972f4c 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -758,14 +758,19 @@ int interpret_branch_name(const char *name, struct strbuf *buf) const char *brace; char *num_end; - if (name[0] != '@' || name[1] != '{' || name[2] != '-') - return -1; - brace = strchr(name, '}'); - if (!brace) - return -1; - nth = strtol(name+3, &num_end, 10); - if (num_end != brace) - return -1; + if (name[0] == '-' && !name[1]) { + nth = 1; + brace = name; /* "end of branch name expression" */ + } else { + if (name[0] != '@' || name[1] != '{' || name[2] != '-') + return -1; + brace = strchr(name, '}'); + if (!brace) + return -1; + nth = strtol(name+3, &num_end, 10); + if (num_end != brace) + return -1; + } if (nth <= 0) return -1; cb.alloc = nth; -- 1.6.2.1.299.gda643a