projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up git-diff-tree 'header' generation
[git.git]
/
rev-parse.c
diff --git
a/rev-parse.c
b/rev-parse.c
index
1b08b45
..
40707ac
100644
(file)
--- a/
rev-parse.c
+++ b/
rev-parse.c
@@
-62,7
+62,7
@@
static int get_parent(char *name, unsigned char *result, int idx)
/*
* This is like "get_sha1()", except it allows "sha1 expressions",
/*
* This is like "get_sha1()", except it allows "sha1 expressions",
- * notably "xyz
.p
" for "parent of xyz"
+ * notably "xyz
^
" for "parent of xyz"
*/
static int get_extended_sha1(char *name, unsigned char *sha1)
{
*/
static int get_extended_sha1(char *name, unsigned char *sha1)
{
@@
-70,15
+70,15
@@
static int get_extended_sha1(char *name, unsigned char *sha1)
int len = strlen(name);
parent = 1;
int len = strlen(name);
parent = 1;
- if (len >
3
&& name[len-1] >= '1' && name[len-1] <= '9') {
+ if (len >
2
&& name[len-1] >= '1' && name[len-1] <= '9') {
parent = name[len-1] - '0';
len--;
}
parent = name[len-1] - '0';
len--;
}
- if (len >
2 && !memcmp(name + len - 2, ".p", 2)
) {
+ if (len >
1 && name[len-1] == '^'
) {
int ret;
int ret;
- name[len-
2
] = 0;
+ name[len-
1
] = 0;
ret = get_parent(name, sha1, parent);
ret = get_parent(name, sha1, parent);
- name[len-
2] = '.
';
+ name[len-
1] = '^
';
if (!ret)
return 0;
}
if (!ret)
return 0;
}