git-fetch --upload-pack: disambiguate.

diff --git a/sha1_name.c b/sha1_name.c
index 49e2cc394f2ebe710ccdbe0aff63eeda90d4718b..b13ed78cee0ee7f6d5ed3b45acee7b308a02c3f6 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -188,7 +188,10 @@ const char *find_unique_abbrev(const unsigned char *sha1, int len)
 {
        int status;
        static char hex[41];
+
        memcpy(hex, sha1_to_hex(sha1), 40);
+       if (len == 40)
+               return hex;
        while (len < 40) {
                unsigned char sha1_ret[20];
                status = get_short_sha1(hex, len, sha1_ret, 1);
@@ -223,7 +226,7 @@ static int ambiguous_path(const char *path, int len)
                        slash = 0;
                        continue;
                }
-               return slash;
+               break;
        }
        return slash;
 }