git-pull: do not barf on -a flag meant for git-fetch.

[git.git] / sha1_name.c

diff --git a/sha1_name.c b/sha1_name.c
index 0225f31..8920de1 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -128,7 +128,7 @@ static int find_unique_short_object(int len, char *canonical,
        }
        /* Both have unique ones -- do they match? */
        if (memcmp(packed_sha1, unpacked_sha1, 20))
-               return -1;
+               return error("short SHA1 %.*s is ambiguous.", len, canonical);
        memcpy(sha1, packed_sha1, 20);
        return 0;
 }