pull: check if in unresolved merge state

diff --git a/setup.c b/setup.c
index fb6186049d1d9af1e84b2468c069b346c5a24a3b..863ddfd938d29e58341bd2be5dd3b7ecd4db7df2 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -140,7 +140,9 @@ int check_filename(const char *prefix, const char *arg)
                if (arg[2] == '\0') /* ":/" is root dir, always exists */
                        return 1;
                name = arg + 2;
-       } else if (prefix)
+       } else if (!no_wildcard(arg))
+               return 1;
+       else if (prefix)
                name = prefix_filename(prefix, strlen(prefix), arg);
        else
                name = arg;