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>
git-mirror · Aug 6, 2007 · 9396943 · 9396943
1 parent 33a798c
commit 9396943
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);
 }