diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-01 16:19:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-01 16:19:03 -0700 |
| commit | 46a1f0728c6b5a886424e74c8bcacedf355eb918 (patch) | |
| tree | 4b3e2bf7d605858408c17e0774248a0f9af227ec /symlinks.c | |
| parent | d12d8ec9d728b0ce148f5a5caa68c858ef180d30 (diff) | |
| parent | 1d718a5108f905e3c64f9fa791e67a52bd926457 (diff) | |
| download | git-46a1f0728c6b5a886424e74c8bcacedf355eb918.tar.gz | |
Merge branch 'js/checkout-untracked-symlink' into maint
* js/checkout-untracked-symlink:
do not overwrite untracked symlinks
Demonstrate breakage: checkout overwrites untracked symlink with directory
Diffstat (limited to 'symlinks.c')
| -rw-r--r-- | symlinks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/symlinks.c b/symlinks.c index 3cacebd91a..034943bda0 100644 --- a/symlinks.c +++ b/symlinks.c @@ -223,7 +223,7 @@ int check_leading_path(const char *name, int len) int flags; int match_len = lstat_cache_matchlen(cache, name, len, &flags, FL_SYMLINK|FL_NOENT|FL_DIR, USE_ONLY_LSTAT); - if (flags & (FL_SYMLINK|FL_NOENT)) + if (flags & FL_NOENT) return 0; else if (flags & FL_DIR) return -1; |