diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-04 00:45:12 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-10 03:42:23 +0400 |
| commit | c036c4c5e426cc7ee8070038607edf06ef1d661e (patch) | |
| tree | 4199271cb7e8884c8adeb34453efb9841bf27dab | |
| parent | 13243c2c7a758bb6510ba26d0372f384b5f422ce (diff) | |
rev-parse: A and B in "rev-parse A..B" refer to committish
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/rev-parse.c | 4 | ||||
| -rwxr-xr-x | 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 98d1cbecca..16b98b5b90 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 0210998800..6de3cb0c92 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.. |