Merge branch 'maint'

[git.git] / builtin-apply.c

diff --git a/builtin-apply.c b/builtin-apply.c
index 0a0b4a9e3f6550b6a4729e94242811dcb6e8d09a..da270755a7b9ecafa3cb47d9f6947c6dc5b2531c 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2508,7 +2508,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);
 }