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

Merge branch 'jk/rev-parse-symbolic-parents-fix'

Browse Source 
"git rev-parse --symbolic" failed with a more recent notation like
"HEAD^-1" and "HEAD^!".

* jk/rev-parse-symbolic-parents-fix:
  rev-parse: fix parent shorthands with --symbolic
This commit is contained in:
Junio C Hamano
2016-12-16 15:27:47 -08:00
parent de2efebf7c a2e7b04c44
commit 598119d3cd
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/rev-parse.c
View File

@ -342,11 +342,16 @@ static int try_parent_shorthands(const char *arg)
for (parents = commit->parents, parent_number = 1;
parents;
parents = parents->next, parent_number++) {
char *name = NULL;
if (exclude_parent && parent_number != exclude_parent)
continue;
if (symbolic)
name = xstrfmt("%s^%d", arg, parent_number);
show_rev(include_parents ? NORMAL : REVERSED,
parents->item->object.oid.hash, arg);
parents->item->object.oid.hash, name);
free(name);
}
*dotdot = '^';