summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-07 14:33:14 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-07 14:33:14 -0700
commit0f3d66c6dc0c6915888fbf928de0ae22739abc70 (patch)
tree6d9ef01cc818a63d7001c06cc305c4a326787926 /dir.c
parente65cdde45444a9cb297d4ff8f18d1eb5529cdce4 (diff)
parent03415ca8db28e67ca04e04126b42f38a90c825de (diff)
downloadgit-0f3d66c6dc0c6915888fbf928de0ae22739abc70.tar.gz
Merge branch 'jk/rm-removed-paths'
A handful of test cases and a corner case bugfix for "git rm". * jk/rm-removed-paths: t3600: document failure of rm across symbolic links t3600: test behavior of reverse-d/f conflict rm: do not complain about d/f conflicts during deletion
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dir.c b/dir.c
index 1e42b2b150..91cfd99671 100644
--- a/dir.c
+++ b/dir.c
@@ -1647,7 +1647,7 @@ int remove_path(const char *name)
{
char *slash;
- if (unlink(name) && errno != ENOENT)
+ if (unlink(name) && errno != ENOENT && errno != ENOTDIR)
return -1;
slash = strrchr(name, '/');