[PATCH] Make sure git-resolve-script always works on commits

diff --git a/sha1_name.c b/sha1_name.c
index 5d1e441e5a9b7c0d6a03e3ee9add8a51238a3227..df45b172a3033cad47e5039defc6de45748aeb5f 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -208,13 +208,9 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
        } else
                parent = -1;
 
-       if (0 <= parent) {
-               ret = get_parent(name, len, sha1, parent);
-               if (!ret)
-                       return 0;
-               else if(parent>0)
-                       return ret;
-       }
+       if (parent >= 0)
+               return get_parent(name, len, sha1, parent);
+
        ret = get_sha1_basic(name, len, sha1);
        if (!ret)
                return 0;