Merge branch 'bc/vcs-svn-cleanup'

diff --git a/combine-diff.c b/combine-diff.c
index ec9d930440993b265fe74aacd2a3fdb768dccf64..9e163d5adabd93fd48a6b563c5f31c32740e01c7 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1053,7 +1053,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
                        if (is_file) {
                                struct strbuf buf = STRBUF_INIT;
 
-                               if (convert_to_git(elem->path, result, len, &buf, safe_crlf)) {
+                               if (convert_to_git(&the_index, elem->path, result, len, &buf, safe_crlf)) {
                                        free(result);
                                        result = strbuf_detach(&buf, &len);
                                        result_size = len;