Merge branch 'maint'

* maint:
  apply: remove directory that becomes empty by renaming the last file away
  setup.c:verify_non_filename(): don't die unnecessarily while disambiguating

diff --git a/builtin-apply.c b/builtin-apply.c
index 0a0b4a9e3f6550b6a4729e94242811dcb6e8d09a..da270755a7b9ecafa3cb47d9f6947c6dc5b2531c 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2508,7 +2508,7 @@ static void write_out_one_result(struct patch *patch, int phase)
         * thing: remove the old, write the new
         */
        if (phase == 0)
-               remove_file(patch, 0);
+               remove_file(patch, patch->is_rename);
        if (phase == 1)
                create_file(patch);
 }

diff --git a/setup.c b/setup.c
index 4945eb3134c3e047f54e51db25cd0aa81d9c47d7..b55b82c99e2f796700ee95abc8bb5a71e01235ab 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -107,7 +107,7 @@ void verify_non_filename(const char *prefix, const char *arg)
        if (!lstat(name, &st))
                die("ambiguous argument '%s': both revision and filename\n"
                    "Use '--' to separate filenames from revisions", arg);
-       if (errno != ENOENT)
+       if (errno != ENOENT && errno != ENOTDIR)
                die("'%s': %s", arg, strerror(errno));
 }