From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH v5 24/25] rev-parse: A and B in "rev-parse A..B" refer to committish
Date: Tue, 3 Jul 2012 14:37:14 -0700 [thread overview]
Message-ID: <1341351435-31011-25-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1341351435-31011-1-git-send-email-gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/rev-parse.c | 4 ++--
t/t1512-rev-parse-disambiguation.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 98d1cbe..16b98b5 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -238,7 +238,7 @@ static int try_difference(const char *arg)
next = "HEAD";
if (dotdot == arg)
this = "HEAD";
- if (!get_sha1(this, sha1) && !get_sha1(next, end)) {
+ if (!get_sha1_committish(this, sha1) && !get_sha1_committish(next, end)) {
show_rev(NORMAL, end, next);
show_rev(symmetric ? NORMAL : REVERSED, sha1, this);
if (symmetric) {
@@ -278,7 +278,7 @@ static int try_parent_shorthands(const char *arg)
return 0;
*dotdot = 0;
- if (get_sha1(arg, sha1))
+ if (get_sha1_committish(arg, sha1))
return 0;
if (!parents_only)
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index c3b78b9..9acaf1d 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -111,7 +111,7 @@ test_expect_success 'log name1..name2 takes only commit-ishes on both ends' '
git log 11021982...
'
-test_expect_failure 'rev-parse name1..name2 takes only commit-ishes on both ends' '
+test_expect_success 'rev-parse name1..name2 takes only commit-ishes on both ends' '
git rev-parse 11021982..11021982 &&
git rev-parse ..11021982 &&
git rev-parse 11021982..
--
1.7.11.1.229.g706c98f
next prev parent reply other threads:[~2012-07-03 21:39 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-03 21:36 [PATCH v5 00/25] Extending the shelf-life of "git describe" output Junio C Hamano
2012-07-03 21:36 ` [PATCH v5 01/25] sha1_name.c: indentation fix Junio C Hamano
2012-07-03 21:36 ` [PATCH v5 02/25] sha1_name.c: hide get_sha1_with_context_1() ugliness Junio C Hamano
2012-07-03 21:36 ` [PATCH v5 03/25] sha1_name.c: get rid of get_sha1_with_mode_1() Junio C Hamano
2012-07-03 21:36 ` [PATCH v5 04/25] sha1_name.c: get rid of get_sha1_with_mode() Junio C Hamano
2012-07-03 21:36 ` [PATCH v5 05/25] sha1_name.c: clarify what "fake" is for in find_short_object_filename() Junio C Hamano
2012-07-03 21:36 ` [PATCH v5 06/25] sha1_name.c: rename "now" to "current" Junio C Hamano
2012-07-03 21:36 ` [PATCH v5 07/25] sha1_name.c: refactor find_short_packed_object() Junio C Hamano
2012-07-03 21:36 ` [PATCH v5 08/25] sha1_name.c: correct misnamed "canonical" and "res" Junio C Hamano
2012-07-03 21:36 ` [PATCH v5 09/25] sha1_name.c: restructure disambiguation of short names Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 10/25] get_sha1(): fix error status regression Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 11/25] sha1_name.c: allow get_short_sha1() to take other flags Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 12/25] sha1_name.c: teach get_short_sha1() a commit-only option Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 13/25] sha1_name.c: get_describe_name() by definition groks only commits Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 14/25] sha1_name.c: get_sha1_1() takes lookup flags Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 15/25] sha1_name.c: many short names can only be committish Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 16/25] sha1_name.c: teach lookup context to get_sha1_with_context() Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 17/25] sha1_name.c: introduce get_sha1_committish() Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 18/25] revision.c: allow handle_revision_arg() to take other flags Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 19/25] revision.c: the "log" family, except for "show", takes committish Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 20/25] sha1_name.c: add support for disambiguating other types Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 21/25] apply: --build-fake-ancestor expects blobs Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 22/25] commit-tree: the command wants a tree and commits Junio C Hamano
2012-07-03 21:37 ` [PATCH v5 23/25] reset: the command takes committish Junio C Hamano
2012-07-03 21:37 ` Junio C Hamano [this message]
2012-07-03 21:37 ` [PATCH v5 25/25] rev-parse --disambiguate=<prefix> Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1341351435-31011-25-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).