undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2012-07-03 13:45:12 -07:00
parent 13243c2c7a
commit c036c4c5e4
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/rev-parse.c
View File

@ -238,7 +238,7 @@ static int try_difference(const char *arg)
next = "HEAD"; next = "HEAD";
if (dotdot == arg) if (dotdot == arg)
this = "HEAD"; 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(NORMAL, end, next);
show_rev(symmetric ? NORMAL : REVERSED, sha1, this); show_rev(symmetric ? NORMAL : REVERSED, sha1, this);
if (symmetric) { if (symmetric) {
@ -278,7 +278,7 @@ static int try_parent_shorthands(const char *arg)
return 0; return 0;
*dotdot = 0; *dotdot = 0;
if (get_sha1(arg, sha1)) if (get_sha1_committish(arg, sha1))
return 0; return 0;
if (!parents_only) if (!parents_only)

2
t/t1512-rev-parse-disambiguation.sh
View File

@ -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..000000000 &&
git rev-parse ..000000000 && git rev-parse ..000000000 &&
git rev-parse 000000000.. git rev-parse 000000000..