Merge branch 'ds/commit-graph-with-grafts' into maint

diff --git a/replace-object.c b/replace-object.c
index 9821f1477edab21d98bfeb89edd301f6d6257753..e295e87943102c2a1ad903aea1a634d34bf603a0 100644 (file)
--- a/replace-object.c
+++ b/replace-object.c
@@ -18,7 +18,7 @@ static int register_replace_ref(struct repository *r,
 
        if (get_oid_hex(hash, &repl_obj->original.oid)) {
                free(repl_obj);
-               warning("bad replace ref name: %s", refname);
+               warning(_("bad replace ref name: %s"), refname);
                return 0;
        }
 
@@ -27,7 +27,7 @@ static int register_replace_ref(struct repository *r,
 
        /* Register new object */
        if (oidmap_put(r->objects->replace_map, repl_obj))
-               die("duplicate replace ref: %s", refname);
+               die(_("duplicate replace ref: %s"), refname);
 
        return 0;
 }
@@ -70,5 +70,5 @@ const struct object_id *do_lookup_replace_object(struct repository *r,
                        return cur;
                cur = &repl_obj->replacement;
        }
-       die("replace depth too high for object %s", oid_to_hex(oid));
+       die(_("replace depth too high for object %s"), oid_to_hex(oid));
 }