Sync with 'maint'

diff --git a/builtin/replace.c b/builtin/replace.c
index e3aaf70203d4f5b6f099ed538d3366fb0a7747ce..398ccd5eaa243045c5d21af1e37462846665568a 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -46,24 +46,27 @@ typedef int (*each_replace_name_fn)(const char *name, const char *ref,
 
 static int for_each_replace_name(const char **argv, each_replace_name_fn fn)
 {
-       const char **p;
+       const char **p, *full_hex;
        char ref[PATH_MAX];
        int had_error = 0;
        unsigned char sha1[20];
 
        for (p = argv; *p; p++) {
-               if (snprintf(ref, sizeof(ref), "refs/replace/%s", *p)
-                                       >= sizeof(ref)) {
-                       error("replace ref name too long: %.*s...", 50, *p);
+               if (get_sha1(*p, sha1)) {
+                       error("Failed to resolve '%s' as a valid ref.", *p);
                        had_error = 1;
                        continue;
                }
+               full_hex = sha1_to_hex(sha1);
+               snprintf(ref, sizeof(ref), "refs/replace/%s", full_hex);
+               /* read_ref() may reuse the buffer */
+               full_hex = ref + strlen("refs/replace/");
                if (read_ref(ref, sha1)) {
-                       error("replace ref '%s' not found.", *p);
+                       error("replace ref '%s' not found.", full_hex);
                        had_error = 1;
                        continue;
                }
-               if (fn(*p, ref, sha1))
+               if (fn(full_hex, ref, sha1))
                        had_error = 1;
        }
        return had_error;