undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-clean: handle errors if removing files fails

Browse Source 
git-clean simply ignored errors if removing a file or directory failed. This
patch makes it raise a warning and the exit code also greater than zero if
there are remaining files.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Miklos Vajna 2008-02-21 02:44:46 +01:00 committed by Junio C Hamano
parent b23b27eb5d
commit aa9c83c219
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin-clean.c
View File

@ -29,7 +29,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
{
int i;
int show_only = 0, remove_directories = 0, quiet = 0, ignored = 0;
int ignored_only = 0, baselen = 0, config_set = 0;
int ignored_only = 0, baselen = 0, config_set = 0, errors = 0;
struct strbuf directory;
struct dir_struct dir;
const char *path, *base;
@ -137,12 +137,15 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (show_only && (remove_directories || matches)) {
printf("Would remove %s\n",
directory.buf + prefix_offset);
} else if (quiet && (remove_directories || matches)) {
remove_dir_recursively(&directory, 0);
} else if (remove_directories || matches) {
printf("Removing %s\n",
directory.buf + prefix_offset);
remove_dir_recursively(&directory, 0);
if (!quiet)
printf("Removing %s\n",
directory.buf + prefix_offset);
if (remove_dir_recursively(&directory, 0) != 0) {
warning("failed to remove '%s'",
directory.buf + prefix_offset);
errors++;
}
} else if (show_only) {
printf("Would not remove %s\n",
directory.buf + prefix_offset);
@ -162,11 +165,14 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
printf("Removing %s\n",
ent->name + prefix_offset);
}
unlink(ent->name);
if (unlink(ent->name) != 0) {
warning("failed to remove '%s'", ent->name);
errors++;
}
}
}
free(seen);
strbuf_release(&directory);
return 0;
return (errors != 0);
}

10
t/t7300-clean.sh
View File

@ -316,4 +316,14 @@ test_expect_success 'core.excludesfile' '
'
test_expect_success 'removal failure' '
mkdir foo &&
touch foo/bar &&
chmod 0 foo &&
! git clean -f -d
'
chmod 755 foo
test_done