Merge branch 'bw/ls-files-sans-the-index'

diff --git a/apply.c b/apply.c
index 679ed7732d2385c4d7704f60335514b2b5f75c39..f24014a705edf5fc1f49e22502f563a469b850ed 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -2256,7 +2256,7 @@ static int read_old_data(struct stat *st, const char *path, struct strbuf *buf)
        case S_IFREG:
                if (strbuf_read_file(buf, path, st->st_size) != st->st_size)
                        return error(_("unable to open or read %s"), path);
-               convert_to_git(path, buf->buf, buf->len, buf, 0);
+               convert_to_git(&the_index, path, buf->buf, buf->len, buf, 0);
                return 0;
        default:
                return -1;