rev-parse: A and B in "rev-parse A..B" refer to committish

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 98d1cbeccacc4b22dee88dab3d0154a3f70afe81..16b98b5b903129faa5547f91e39f5ee5a6c98e6f 100644 (file)
--- 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";
                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) {
                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;
                return 0;
 
        *dotdot = 0;

-       if (get_sha1(arg, sha1))
+       if (get_sha1_committish(arg, sha1))

                return 0;
 
        if (!parents_only)
                return 0;
 
        if (!parents_only)

diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 02109988005f6451974d71bb2d264e74bc556723..6de3cb0c920d8d2943c2e0f1c05eb1af4cd182fe 100755 (executable)
--- 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...
 '
 
        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..
        git rev-parse 000000000..000000000 &&
        git rev-parse ..000000000 &&
        git rev-parse 000000000..