X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin-merge-recursive.c;h=d8875d589240e0c78a9e241a7d2bdde1d10ab800;hb=0901d5a2ef80996cf64c8afeaec765e1bc09f795;hp=710674c6b2cccec4f1e0baa477a11d78cda72833;hpb=a19f101e3f31234db23bd1eb24994db6e4caa443;p=git.git
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 710674c6b..d8875d589 100644
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -25,19 +25,30 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
struct commit *result;
init_merge_options(&o);
- if (argv[0]) {
- int namelen = strlen(argv[0]);
- if (8 < namelen &&
- !strcmp(argv[0] + namelen - 8, "-subtree"))
- o.subtree_merge = 1;
- }
+ if (argv[0] && !suffixcmp(argv[0], "-subtree"))
+ o.subtree_shift = "";
if (argc < 4)
usagef("%s