mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint-1.7.11' into maint

Browse Source
This commit is contained in:
Junio C Hamano
2012-09-12 14:08:05 -07:00
parent cbd6b089e8 1403db49b8
commit 3503e9ab32
19 changed files with 318 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/rev-parse.c
View File

@ -230,6 +230,7 @@ static int try_difference(const char *arg)
const char *next;
const char *this;
int symmetric;
static const char head_by_default[] = "HEAD";
if (!(dotdot = strstr(arg, "..")))
return 0;
@ -241,9 +242,20 @@ static int try_difference(const char *arg)
next += symmetric;
if (!*next)
next = "HEAD";
next = head_by_default;
if (dotdot == arg)
this = "HEAD";
this = head_by_default;
if (this == head_by_default && next == head_by_default &&
!symmetric) {
/*
* Just ".."? That is not a range but the
* pathspec for the parent directory.
*/
*dotdot = '.';
return 0;
}
if (!get_sha1_committish(this, sha1) && !get_sha1_committish(next, end)) {
show_rev(NORMAL, end, next);
show_rev(symmetric ? NORMAL : REVERSED, sha1, this);