wt-status.c: split rebase detection out of wt_status_get_state()

diff --git a/builtin/apply.c b/builtin/apply.c
index dbdfa9b646f5891628e15278bf559a2397769754..8e4da2e1bdaf02590289f54750a9602281f4a365 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4371,8 +4371,10 @@ static int apply_patch(int fd, const char *filename, int options)
                patch->inaccurate_eof = !!(options & INACCURATE_EOF);
                patch->recount =  !!(options & RECOUNT);
                nr = parse_chunk(buf.buf + offset, buf.len - offset, patch);
-               if (nr < 0)
+               if (nr < 0) {
+                       free_patch(patch);
                        break;
+               }
                if (apply_in_reverse)
                        reverse_patches(patch);
                if (use_patch(patch)) {
@@ -4381,6 +4383,8 @@ static int apply_patch(int fd, const char *filename, int options)
                        listp = &patch->next;
                }
                else {
+                       if (apply_verbosely)
+                               say_patch_name(stderr, _("Skipped patch '%s'."), patch);
                        free_patch(patch);
                        skipped_patch++;
                }