progress: break too long progress bar lines

diff --git a/merge-recursive.c b/merge-recursive.c
index a596d95739a398af8940094989db62973e01a6ab..4851825aebf29d129aa4b82d860adcbb2697a300 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -475,7 +475,8 @@ static void get_files_dirs(struct merge_options *o, struct tree *tree)
 {
        struct pathspec match_all;
        memset(&match_all, 0, sizeof(match_all));
-       read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);
+       read_tree_recursive(the_repository, tree, "", 0, 0,
+                           &match_all, save_files_dirs, o);
 }
 
 static int get_tree_entry_if_blob(const struct object_id *tree,
@@ -3412,7 +3413,7 @@ int merge_trees(struct merge_options *o,
        int code, clean;
        struct strbuf sb = STRBUF_INIT;
 
-       if (!o->call_depth && index_has_changes(istate, head, &sb)) {
+       if (!o->call_depth && repo_index_has_changes(o->repo, head, &sb)) {
                err(o, _("Your local changes to the following files would be overwritten by merge:\n  %s"),
                    sb.buf);
                return -1;