[PATCH 66/86] builtin/merge-recursive: replace prefixcmd() with has_prefix()
flat view
STALE3778d
From: Christian Couder <hidden>
Date: 2016-06-15 22:59:13
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Christian Couder <redacted> --- builtin/merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index e7f1a39..73896dc 100644
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c@@ -38,7 +38,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix) for (i = 1; i < argc; ++i) { const char *arg = argv[i]; - if (!prefixcmp(arg, "--")) { + if (has_prefix(arg, "--")) { if (!arg[2]) break; if (parse_merge_opt(&o, arg + 2))
--
1.8.4.1.566.geca833c