combine-diff: better hunk splitting.

diff --git a/sha1_name.c b/sha1_name.c
index b13ed78cee0ee7f6d5ed3b45acee7b308a02c3f6..e18a96d772f4186cfaffe6053a3f1664a9fdad3f 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -143,7 +143,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 -2;
+               return SHORT_NAME_AMBIGUOUS;
        memcpy(sha1, packed_sha1, 20);
        return 0;
 }