aboutsummaryrefslogtreecommitdiff
path: root/sha1_name.c
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2005-08-10 05:07:36 +0200
committerJunio C Hamano <junkio@cox.net>2005-08-10 10:22:49 -0700
commitef0bd2e6e643f09a8294937caf99463328b9215a (patch)
tree7c10e111b2709fe24f09527bab62ecfb441c44eb /sha1_name.c
parentc35a7b8d806317dc1762e36561cbd31c2530dd9c (diff)
downloadgit-ef0bd2e6e643f09a8294937caf99463328b9215a.tar.gz
git-ef0bd2e6e643f09a8294937caf99463328b9215a.tar.xz
[PATCH] Fix git-rev-parse's parent handling
git-rev-parse HEAD^1 would fail, because of an off-by-one bug (but HEAD^ would yield the expected result). Also, when the parent does not exist, do not silently return an incorrect SHA1. Of course, this no longer applies to git-rev-parse alone, but every user of get_sha1(). While at it, add a test. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'sha1_name.c')
-rw-r--r--sha1_name.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sha1_name.c b/sha1_name.c
index df3ba2d43..5d1e441e5 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -202,15 +202,18 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
parent = name[len-1] - '0';
len -= 2;
}
- else if (len > 1 && name[len-1] == '^')
+ else if (len > 1 && name[len-1] == '^') {
parent = 1;
- else
+ len--;
+ } else
parent = -1;
if (0 <= parent) {
- ret = get_parent(name, len-1, sha1, parent);
+ ret = get_parent(name, len, sha1, parent);
if (!ret)
return 0;
+ else if(parent>0)
+ return ret;
}
ret = get_sha1_basic(name, len, sha1);
if (!ret)