Sync with 2.4.7

diff --git a/builtin/replace.c b/builtin/replace.c
index 54bf01acb4ca060a1dae43b399a6aefb1abe4eee..0d52e7fa1d394d3c39437010592e4de428f53b34 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -35,7 +35,7 @@ struct show_data {
        enum replace_format format;
 };
 
-static int show_reference(const char *refname, const unsigned char *sha1,
+static int show_reference(const char *refname, const struct object_id *oid,
                          int flag, void *cb_data)
 {
        struct show_data *data = cb_data;
@@ -44,19 +44,19 @@ static int show_reference(const char *refname, const unsigned char *sha1,
                if (data->format == REPLACE_FORMAT_SHORT)
                        printf("%s\n", refname);
                else if (data->format == REPLACE_FORMAT_MEDIUM)
-                       printf("%s -> %s\n", refname, sha1_to_hex(sha1));
+                       printf("%s -> %s\n", refname, oid_to_hex(oid));
                else { /* data->format == REPLACE_FORMAT_LONG */
-                       unsigned char object[20];
+                       struct object_id object;
                        enum object_type obj_type, repl_type;
 
-                       if (get_sha1(refname, object))
+                       if (get_sha1(refname, object.hash))
                                return error("Failed to resolve '%s' as a valid ref.", refname);
 
-                       obj_type = sha1_object_info(object, NULL);
-                       repl_type = sha1_object_info(sha1, NULL);
+                       obj_type = sha1_object_info(object.hash, NULL);
+                       repl_type = sha1_object_info(oid->hash, NULL);
 
                        printf("%s (%s) -> %s (%s)\n", refname, typename(obj_type),
-                              sha1_to_hex(sha1), typename(repl_type));
+                              oid_to_hex(oid), typename(repl_type));
                }
        }
 
@@ -82,7 +82,7 @@ static int list_replace_refs(const char *pattern, const char *format)
                    "valid formats are 'short', 'medium' and 'long'\n",
                    format);
 
-       for_each_replace_ref(show_reference, (void *) &data);
+       for_each_replace_ref(show_reference, (void *)&data);
 
        return 0;
 }