From: Junio C Hamano Date: Tue, 3 Jul 2012 20:45:12 +0000 (-0700) Subject: rev-parse: A and B in "rev-parse A..B" refer to committish X-Git-Tag: v1.7.12-rc0~22^2~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c036c4c5e426cc7ee8070038607edf06ef1d661e;p=git.git rev-parse: A and B in "rev-parse A..B" refer to committish Signed-off-by: Junio C Hamano --- diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 98d1cbecc..16b98b5b9 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 021099880..6de3cb0c9 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 000000000... ' -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 000000000..000000000 && git rev-parse ..000000000 && git rev-parse 000000000..