From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: [PATCH v4 14/18] sha1_name.c: many short names can only be committish Date: Mon, 2 Jul 2012 15:34:05 -0700 Message-ID: <1341268449-27801-15-git-send-email-gitster@pobox.com> References: <1341268449-27801-1-git-send-email-gitster@pobox.com> To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Jul 03 00:35:29 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SlpDM-0004CJ-HG for gcvg-git-2@plane.gmane.org; Tue, 03 Jul 2012 00:35:28 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933164Ab2GBWe7 (ORCPT ); Mon, 2 Jul 2012 18:34:59 -0400 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:39953 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756346Ab2GBWek (ORCPT ); Mon, 2 Jul 2012 18:34:40 -0400 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id EB9299095 for ; Mon, 2 Jul 2012 18:34:39 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to :subject:date:message-id:in-reply-to:references; s=sasl; bh=aXit SPE1N2PngEBAlcjrq11gRvA=; b=retNM9WnYYlFR1A0Dv5YNPYC8yG6kTGAKOL5 OcbMKC5a1jHWYkToJsVQp+42JhvneNyEZpS0BC+oGTOVhpQ/LKjA0QCMbd8I1Tjs cboFl1Ruy6Gg8mKTH/ZOa7VvzC2oxtPBzF50nPMLQoO3cpC8aSa1aVQgJ+6zMQh2 O5nww5s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:subject :date:message-id:in-reply-to:references; q=dns; s=sasl; b=lv+ejA fNcc7PIbrUeEsvEf7NttXCNGfMQmLMYuxuoIFS3Ol9UDqckopT3OG8qqRreYU9ts mQWGvCB76FHXbpLZt4Q1bjUsElnyHWnnF41UNe0wUd2xHw5wfooSTal9vQouHY5j XSlFiS96Pcnumz0nYjm6ryjIOUyYeOSrfrGpQ= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id E32E59094 for ; Mon, 2 Jul 2012 18:34:39 -0400 (EDT) Received: from pobox.com (unknown [98.234.214.94]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 49C409093 for ; Mon, 2 Jul 2012 18:34:39 -0400 (EDT) X-Mailer: git-send-email 1.7.11.1.212.g52fe12e In-Reply-To: <1341268449-27801-1-git-send-email-gitster@pobox.com> X-Pobox-Relay-ID: 1C153952-C496-11E1-A093-FC762E706CDE-77302942!b-pb-sasl-quonix.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: We know that the token "$name" that appear in "$name^{commit}", "$name^4", "$name~4" etc. can only name a committish (either a commit or a tag that peels to a commit). Teach get_short_sha1() to take advantage of that knowledge when disambiguating an abbreviated SHA-1 given as an object name. Signed-off-by: Junio C Hamano --- cache.h | 1 + sha1_name.c | 32 ++++++++++++++++++++++++++++---- t/t1512-rev-parse-disambiguation.sh | 2 +- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/cache.h b/cache.h index 29f0b2a..1acf3b4 100644 --- a/cache.h +++ b/cache.h @@ -813,6 +813,7 @@ struct object_context { #define GET_SHA1_QUIETLY 01 #define GET_SHA1_COMMIT 02 +#define GET_SHA1_COMMITTISH 04 extern int get_sha1(const char *str, unsigned char *sha1); extern void die_on_misspelt_object_name(const char *name, const char *prefix); diff --git a/sha1_name.c b/sha1_name.c index 6f6c49c..35ad473 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -224,6 +224,24 @@ static int disambiguate_commit_only(const unsigned char *sha1, void *cb_data_unu return kind == OBJ_COMMIT; } +static int disambiguate_committish_only(const unsigned char *sha1, void *cb_data_unused) +{ + struct object *obj; + int kind; + + kind = sha1_object_info(sha1, NULL); + if (kind == OBJ_COMMIT) + return 1; + if (kind != OBJ_TAG) + return 0; + + /* We need to do this the hard way... */ + obj = deref_tag(lookup_object(sha1), NULL, 0); + if (obj && obj->type == OBJ_COMMIT) + return 1; + return 0; +} + static int get_short_sha1(const char *name, int len, unsigned char *sha1, unsigned flags) { @@ -261,6 +279,8 @@ static int get_short_sha1(const char *name, int len, unsigned char *sha1, memset(&ds, 0, sizeof(ds)); if (flags & GET_SHA1_COMMIT) ds.fn = disambiguate_commit_only; + else if (flags & GET_SHA1_COMMITTISH) + ds.fn = disambiguate_committish_only; find_short_object_filename(len, hex_pfx, &ds); find_short_packed_object(len, bin_pfx, &ds); @@ -440,9 +460,9 @@ static int get_parent(const char *name, int len, unsigned char *result, int idx) { unsigned char sha1[20]; - int ret = get_sha1_1(name, len, sha1, 0); struct commit *commit; struct commit_list *p; + int ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH); if (ret) return ret; @@ -473,7 +493,7 @@ static int get_nth_ancestor(const char *name, int len, struct commit *commit; int ret; - ret = get_sha1_1(name, len, sha1, 0); + ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH); if (ret) return ret; commit = lookup_commit_reference(sha1); @@ -519,6 +539,7 @@ static int peel_onion(const char *name, int len, unsigned char *sha1) unsigned char outer[20]; const char *sp; unsigned int expected_type = 0; + unsigned lookup_flags; struct object *o; /* @@ -554,7 +575,10 @@ static int peel_onion(const char *name, int len, unsigned char *sha1) else return -1; - if (get_sha1_1(name, sp - name - 2, outer, 0)) + if (expected_type == OBJ_COMMIT) + lookup_flags = GET_SHA1_COMMITTISH; + + if (get_sha1_1(name, sp - name - 2, outer, lookup_flags)) return -1; o = parse_object(outer); @@ -666,7 +690,7 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned l if (!ret) return 0; - return get_short_sha1(name, len, sha1, 0); + return get_short_sha1(name, len, sha1, lookup_flags); } /* diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index 42701ad..823e288 100755 --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -54,7 +54,7 @@ test_expect_success 'first commit' ' git commit -m d8znjge0 ' -test_expect_failure 'disambiguate commit-ish' ' +test_expect_success 'disambiguate commit-ish' ' # feed commit-ish in an unambiguous way git rev-parse --verify 1102198268^{commit} && -- 1.7.11.1.212.g52fe12e