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
This commit is contained in:
commit
a6954452ec
@ -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);
|
||||
}
|
||||
|
2
setup.c
2
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));
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user