Merge branch 'jk/add-i-fixes'

[thirdparty/git.git] / add-patch.c

diff --git a/add-patch.c b/add-patch.c
index 457b8c550eb1b9711a67ceda65c27841ee7e3150..cd5cfc93fad5a04643718edd56b65326b51ff7ee 100644 (file)
--- a/add-patch.c
+++ b/add-patch.c
@@ -266,6 +266,20 @@ struct add_p_state {
        const char *revision;
 };
 
+static void add_p_state_clear(struct add_p_state *s)
+{
+       size_t i;
+
+       strbuf_release(&s->answer);
+       strbuf_release(&s->buf);
+       strbuf_release(&s->plain);
+       strbuf_release(&s->colored);
+       for (i = 0; i < s->file_diff_nr; i++)
+               free(s->file_diff[i].hunk);
+       free(s->file_diff);
+       clear_add_i_state(&s->s);
+}
+
 static void err(struct add_p_state *s, const char *fmt, ...)
 {
        va_list args;
@@ -1641,7 +1655,7 @@ soft_increment:
                                         NULL, 0, NULL, 0))
                                error(_("'git apply' failed"));
                }
-               if (!repo_read_index(s->s.r))
+               if (repo_read_index(s->s.r) >= 0)
                        repo_refresh_and_write_index(s->s.r, REFRESH_QUIET, 0,
                                                     1, NULL, NULL, NULL);
        }
@@ -1690,9 +1704,7 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
             repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
                                          NULL, NULL, NULL) < 0) ||
            parse_diff(&s, ps) < 0) {
-               strbuf_release(&s.plain);
-               strbuf_release(&s.colored);
-               clear_add_i_state(&s.s);
+               add_p_state_clear(&s);
                return -1;
        }
 
@@ -1707,10 +1719,6 @@ int run_add_p(struct repository *r, enum add_p_mode mode,
        else if (binary_count == s.file_diff_nr)
                fprintf(stderr, _("Only binary files changed.\n"));
 
-       strbuf_release(&s.answer);
-       strbuf_release(&s.buf);
-       strbuf_release(&s.plain);
-       strbuf_release(&s.colored);
-       clear_add_i_state(&s.s);
+       add_p_state_clear(&s);
        return 0;
 }