git-commit: document --amend

diff --git a/sha1_name.c b/sha1_name.c
index d67de18ba5f5aa1f5b3dd1c5c81e75618d12e330..4f92e12a8dfce29b5bb50108468259d9f04653f3 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -235,14 +235,21 @@ static int ambiguous_path(const char *path, int len)
 
 static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 {
-       static const char *prefix[] = {
-               "",
-               "refs",
-               "refs/tags",
-               "refs/heads",
+       static const char *fmt[] = {
+               "%.*s",
+               "refs/%.*s",
+               "refs/tags/%.*s",
+               "refs/heads/%.*s",
+               "refs/remotes/%.*s",
+               "refs/remotes/%.*s/HEAD",
                NULL
        };
        const char **p;
+       const char *warning = "warning: refname '%.*s' is ambiguous.\n";
+       char *pathname;
+       int already_found = 0;
+       unsigned char *this_result;
+       unsigned char sha1_from_ref[20];
 
        if (len == 40 && !get_sha1_hex(str, sha1))
                return 0;
@@ -251,11 +258,21 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
        if (ambiguous_path(str, len))
                return -1;
 
-       for (p = prefix; *p; p++) {
-               char *pathname = git_path("%s/%.*s", *p, len, str);
-               if (!read_ref(pathname, sha1))
-                       return 0;
+       for (p = fmt; *p; p++) {
+               this_result = already_found ? sha1_from_ref : sha1;
+               pathname = git_path(*p, len, str);
+               if (!read_ref(pathname, this_result)) {
+                       if (warn_ambiguous_refs) {
+                               if (already_found)
+                                       fprintf(stderr, warning, len, str);
+                               already_found++;
+                       }
+                       else
+                               return 0;
+               }
        }
+       if (already_found)
+               return 0;
        return -1;
 }