Merge branch 'tf/doc-pt-br'

diff --git a/builtin-replace.c b/builtin-replace.c
index b5c40aa22a0b4e66daf46708c33e6b96051f1dda..fe3a647a36c9a064d32c8bf9d9868da041bd82a2 100644 (file)
--- a/builtin-replace.c
+++ b/builtin-replace.c
@@ -14,6 +14,7 @@
 #include "parse-options.h"
 
 static const char * const git_replace_usage[] = {
+       "git replace [-f] <object> <replacement>",
        "git replace -d <object>...",
        "git replace -l [<pattern>]",
        NULL
@@ -77,29 +78,82 @@ static int delete_replace_ref(const char *name, const char *ref,
        return 0;
 }
 
+static int replace_object(const char *object_ref, const char *replace_ref,
+                         int force)
+{
+       unsigned char object[20], prev[20], repl[20];
+       char ref[PATH_MAX];
+       struct ref_lock *lock;
+
+       if (get_sha1(object_ref, object))
+               die("Failed to resolve '%s' as a valid ref.", object_ref);
+       if (get_sha1(replace_ref, repl))
+               die("Failed to resolve '%s' as a valid ref.", replace_ref);
+
+       if (snprintf(ref, sizeof(ref),
+                    "refs/replace/%s",
+                    sha1_to_hex(object)) > sizeof(ref) - 1)
+               die("replace ref name too long: %.*s...", 50, ref);
+       if (check_ref_format(ref))
+               die("'%s' is not a valid ref name.", ref);
+
+       if (!resolve_ref(ref, prev, 1, NULL))
+               hashclr(prev);
+       else if (!force)
+               die("replace ref '%s' already exists", ref);
+
+       lock = lock_any_ref_for_update(ref, prev, 0);
+       if (!lock)
+               die("%s: cannot lock the ref", ref);
+       if (write_ref_sha1(lock, repl, NULL) < 0)
+               die("%s: cannot update the ref", ref);
+
+       return 0;
+}
+
 int cmd_replace(int argc, const char **argv, const char *prefix)
 {
-       int list = 0, delete = 0;
+       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_END()
        };
 
-       argc = parse_options(argc, argv, options, git_replace_usage, 0);
+       argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0);
 
        if (list && delete)
-               usage_with_options(git_replace_usage, options);
+               usage_msg_opt("-l and -d cannot be used together",
+                             git_replace_usage, options);
+
+       if (force && (list || delete))
+               usage_msg_opt("-f cannot be used with -d or -l",
+                             git_replace_usage, options);
 
+       /* Delete refs */
        if (delete) {
                if (argc < 1)
-                       usage_with_options(git_replace_usage, options);
+                       usage_msg_opt("-d needs at least one argument",
+                                     git_replace_usage, options);
                return for_each_replace_name(argv, delete_replace_ref);
        }
 
+       /* Replace object */
+       if (!list && argc) {
+               if (argc != 2)
+                       usage_msg_opt("bad number of arguments",
+                                     git_replace_usage, options);
+               return replace_object(argv[0], argv[1], force);
+       }
+
        /* List refs, even if "list" is not set */
        if (argc > 1)
-               usage_with_options(git_replace_usage, options);
+               usage_msg_opt("only one pattern can be given with -l",
+                             git_replace_usage, options);
+       if (force)
+               usage_msg_opt("-f needs some arguments",
+                             git_replace_usage, options);
 
        return list_replace_refs(argv[0]);
 }