diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-18 16:17:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-18 16:17:28 -0700 |
| commit | 6fb8e8f401a065bdffe379764871551e37a041a0 (patch) | |
| tree | 96f41d575c40cecd61f20254c327c3a03fc7044b /builtin-apply.c | |
| parent | abbf594763a14e9c00c61f688e45bed636f1eb52 (diff) | |
| parent | 0ad64fd0b8d073e0c73836858a54f693c9191918 (diff) | |
| download | git-6fb8e8f401a065bdffe379764871551e37a041a0.tar.gz git-6fb8e8f401a065bdffe379764871551e37a041a0.tar.xz | |
Merge branch 'maint'
* maint:
git-shortlog: Fix two formatting errors in asciidoc documentation
Fix overwriting of files when applying contextually independent diffs
git-svn: don't allow globs to match regular files
Diffstat (limited to 'builtin-apply.c')
| -rw-r--r-- | builtin-apply.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index fd92ef717..94311e7af 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2416,8 +2416,7 @@ static void create_one_file(char *path, unsigned mode, const char *buf, unsigned * used to be. */ struct stat st; - errno = 0; - if (!lstat(path, &st) && S_ISDIR(st.st_mode) && !rmdir(path)) + if (!lstat(path, &st) && (!S_ISDIR(st.st_mode) || !rmdir(path))) errno = EEXIST; } |