builtin/apply: make add_conflicted_stages_file() return -1 on error

diff --git a/combine-diff.c b/combine-diff.c
index 5940dc87070c7e5f8aabbe920341fc5de1959c2c..8e2a577bdb43297c619a1f4322dab9e4a5572d6a 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1525,7 +1525,7 @@ void diff_tree_combined(const unsigned char *sha1,
                free(tmp);
        }
 
-       free_pathspec(&diffopts.pathspec);
+       clear_pathspec(&diffopts.pathspec);
 }
 
 void diff_tree_combined_merge(const struct commit *commit, int dense,