t6023: merge-file fails to output anything for a degenerate merge

diff --git a/builtin-apply.c b/builtin-apply.c
index 50b623e54c003fb5bbe183568d13f496c3c41c25..7a1ff041f15cd4e6ce2a5b1d1e3cb668f2f54f5e 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2445,7 +2445,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
                return error("%s: %s", old_name, strerror(errno));
        }
 
-       if (!cached)
+       if (!cached && !tpatch)
                st_mode = ce_mode_from_stat(*ce, st->st_mode);
 
        if (patch->is_new < 0)