apply: remove directory that becomes empty by renaming the last file away
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 5 Aug 2007 04:48:08 +0000 (21:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Aug 2007 08:36:59 +0000 (01:36 -0700)
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>
builtin-apply.c
index 490e23ef40c2b2d16272c67a67a14a1eb03b3877..9ee93936627b4df97ee5fea3af74ba0739becb98 100644 (file)
@@ -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);
 }