Merge branch 'jc/maint-doc-checkout-b-always-takes-branch-name'

diff --git a/builtin/replace.c b/builtin/replace.c
index 517fa1031a86f50c0d41ba567237aa701e9c2c05..e3aaf70203d4f5b6f099ed538d3366fb0a7747ce 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -14,9 +14,9 @@
 #include "parse-options.h"
 
 static const char * const git_replace_usage[] = {
-       "git replace [-f] <object> <replacement>",
-       "git replace -d <object>...",
-       "git replace -l [<pattern>]",
+       N_("git replace [-f] <object> <replacement>"),
+       N_("git replace -d <object>..."),
+       N_("git replace -l [<pattern>]"),
        NULL
 };
 
@@ -58,7 +58,7 @@ static int for_each_replace_name(const char **argv, each_replace_name_fn fn)
                        had_error = 1;
                        continue;
                }
-               if (!resolve_ref(ref, sha1, 1, NULL)) {
+               if (read_ref(ref, sha1)) {
                        error("replace ref '%s' not found.", *p);
                        had_error = 1;
                        continue;
@@ -97,7 +97,7 @@ static int replace_object(const char *object_ref, const char *replace_ref,
        if (check_refname_format(ref, 0))
                die("'%s' is not a valid ref name.", ref);
 
-       if (!resolve_ref(ref, prev, 1, NULL))
+       if (read_ref(ref, prev))
                hashclr(prev);
        else if (!force)
                die("replace ref '%s' already exists", ref);
@@ -115,9 +115,9 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
 {
        int list = 0, delete = 0, force = 0;
        struct option options[] = {
-               OPT_BOOLEAN('l', NULL, &list, "list replace refs"),
-               OPT_BOOLEAN('d', NULL, &delete, "delete replace refs"),
-               OPT_BOOLEAN('f', NULL, &force, "replace the ref if it exists"),
+               OPT_BOOLEAN('l', NULL, &list, N_("list replace refs")),
+               OPT_BOOLEAN('d', NULL, &delete, N_("delete replace refs")),
+               OPT_BOOLEAN('f', NULL, &force, N_("replace the ref if it exists")),
                OPT_END()
        };