diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2007-08-05 06:48:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-06 10:36:59 +0200 |
| commit | 93969438dca50c7f0039fcf35e7ab82776d4122f (patch) | |
| tree | 26c48b6cba5b173ecd065e5173141b145b2bfdd7 | |
| parent | setup.c:verify_non_filename(): don't die unnecessarily while disambiguating (diff) | |
| download | git-93969438dca50c7f0039fcf35e7ab82776d4122f.tar.xz git-93969438dca50c7f0039fcf35e7ab82776d4122f.zip | |
apply: remove directory that becomes empty by renaming the last file away
We attempt to remove directory that becomes empty after removal
of a file. We should do the same when we rename an existing
file away.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c index 490e23ef40..9ee9393662 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2489,7 +2489,7 @@ static void write_out_one_result(struct patch *patch, int phase) * thing: remove the old, write the new */ if (phase == 0) - remove_file(patch, 0); + remove_file(patch, patch->is_rename); if (phase == 1) create_file(patch); } |