From ef0bd2e6e643f09a8294937caf99463328b9215a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 10 Aug 2005 05:07:36 +0200 Subject: [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 Signed-off-by: Junio C Hamano --- sha1_name.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'sha1_name.c') 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) -- cgit v1.2.1