summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-06 08:37:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-06 08:37:10 (GMT)
commita6954452ecf757523b31d6eaaf7e00c7a2d91e46 (patch)
tree83019fdce5742e2c84ca2278835e8da1b629fe33
parenta76c2acb28146f5630592f2ba738c0ebf0f3c1c4 (diff)
parent93969438dca50c7f0039fcf35e7ab82776d4122f (diff)
downloadgit-a6954452ecf757523b31d6eaaf7e00c7a2d91e46.zip
git-a6954452ecf757523b31d6eaaf7e00c7a2d91e46.tar.gz
git-a6954452ecf757523b31d6eaaf7e00c7a2d91e46.tar.bz2
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
-rw-r--r--builtin-apply.c2
-rw-r--r--setup.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index 0a0b4a9..da27075 100644
--- 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 4945eb3..b55b82c 100644
--- 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));
}