Andrew's git / gitweb.git / blobdiff
?
receive-pack: detect aliased updates which can occur with symrefs
[gitweb.git] / builtin-merge-recursive.c
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 1a160d81277471ffb0af03712586d27be3198e6f..d8875d589240e0c78a9e241a7d2bdde1d10ab800 100644 (file)
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -25,10 +25,8 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
        struct commit *result;
 
        init_merge_options(&o);
-       if (argv[0]) {
-               if (!suffixcmp(argv[0], "-subtree"))
-                       o.recursive_variant = MERGE_RECURSIVE_SUBTREE;
-       }
+       if (argv[0] && !suffixcmp(argv[0], "-subtree"))
+               o.subtree_shift = "";
 
        if (argc < 4)
                usagef("%s <base>... -- <head> <remote> ...", argv[0]);
@@ -44,7 +42,9 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
                        else if (!strcmp(arg+2, "theirs"))
                                o.recursive_variant = MERGE_RECURSIVE_THEIRS;
                        else if (!strcmp(arg+2, "subtree"))
-                               o.recursive_variant = MERGE_RECURSIVE_SUBTREE;
+                               o.subtree_shift = "";
+                       else if (!prefixcmp(arg+2, "subtree="))
+                               o.subtree_shift = arg + 10;
                        else
                                die("Unknown option %s", arg);
                        continue;