global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-18 14:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'clean-long-paths'

Browse Source 
This addresses https://github.com/git-for-windows/git/issues/521

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2018-06-08 13:42:47 +02:00
parent 5624ea3fc8 74d3df5faa
commit 27eac9b345
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/clean.c
View File

@@ -193,7 +193,8 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
strbuf_setlen(path, len);
strbuf_addstr(path, e->d_name);
if (lstat(path->buf, &st))
; /* fall thru */
warning("Could not stat path '%s': %s",
path->buf, strerror(errno));
else if (S_ISDIR(st.st_mode)) {
if (remove_dirs(path, prefix, force_flag, dry_run, quiet, &gone))
ret = 1;

11
t/t7300-clean.sh
View File

@@ -669,4 +669,15 @@ test_expect_success 'git clean -d skips untracked dirs containing ignored files'
test_path_is_missing foo/b/bb
'
test_expect_success MINGW 'handle clean & core.longpaths = false nicely' '
git config core.longpaths false &&
test_when_finished git config --unset core.longpaths &&
a50=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&
mkdir -p $a50$a50/$a50$a50/$a50$a50 &&
touch $a50$a50/test.txt &&
touch $a50$a50/$a50$a50/$a50$a50/test.txt &&
test_must_fail git clean -xdf 2>.git/err &&
grep "too long" .git/err
'
test_done