diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-22 08:30:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 08:30:38 -0700 |
| commit | 21919d396a3a05ccb8d6b538b246500f01585bb7 (patch) | |
| tree | 0b7d4710abcdb0b637557808064cd40bc3b72da6 /builtin | |
| parent | e0ae1e6f4d53c68bd219385f6f309c033d0fc673 (diff) | |
| parent | 25755e842f814751fbdb7abfc8255a40f24bfaa3 (diff) | |
| download | git-21919d396a3a05ccb8d6b538b246500f01585bb7.tar.gz | |
Merge branch 'pc/remove-warn' into maint
* pc/remove-warn:
Remove a redundant errno test in a usage of remove_path
Introduce remove_or_warn function
Implement the rmdir_or_warn function
Generalise the unlink_or_warn function
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/apply.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index f669157b42..59bbcdb132 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3141,11 +3141,7 @@ static void remove_file(struct patch *patch, int rmdir_empty) die("unable to remove %s from index", patch->old_name); } if (!cached) { - if (S_ISGITLINK(patch->old_mode)) { - if (rmdir(patch->old_name)) - warning("unable to remove submodule %s", - patch->old_name); - } else if (!unlink_or_warn(patch->old_name) && rmdir_empty) { + if (!remove_or_warn(patch->old_mode, patch->old_name) && rmdir_empty) { remove_path(patch->old_name); } } |