Avoid scary errors about tagged trees/blobs during git-fetch

diff --git a/wt-status.c b/wt-status.c
index f053c15ffe266d9925379a71781bdacd56fcea26..10ce6eedc7e8adbcc3b12e1987d2e16b532a4e07 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -198,7 +198,7 @@ static void wt_read_cache(struct wt_status *s)
        read_cache();
 }
 
-void wt_status_print_initial(struct wt_status *s)
+static void wt_status_print_initial(struct wt_status *s)
 {
        int i;
        char buf[PATH_MAX];
@@ -227,6 +227,7 @@ static void wt_status_print_updated(struct wt_status *s)
        rev.diffopt.format_callback = wt_status_print_updated_cb;
        rev.diffopt.format_callback_data = s;
        rev.diffopt.detect_rename = 1;
+       rev.diffopt.rename_limit = 100;
        wt_read_cache(s);
        run_diff_index(&rev, 1);
 }
@@ -263,7 +264,7 @@ static void wt_status_print_untracked(struct wt_status *s)
        if (excludes_file && file_exists(excludes_file))
                add_excludes_from_file(&dir, excludes_file);
 
-       read_directory(&dir, ".", "", 0);
+       read_directory(&dir, ".", "", 0, NULL);
        for(i = 0; i < dir.nr; i++) {
                /* check for matching entry, which is unmerged; lifted from
                 * builtin-ls-files:show_other_files */