Enable wt-status to run against non-standard index file.

We still default to get_index_file(), but this can be overridden
by setting wt_status.index_file after calling wt_status_prepare().

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/wt-status.c b/wt-status.c
index eeb16915c2ef2f62379e0feb08cf9468ec3acf81..03b5ec4488cb25bca2f9d96493e874d7c12d3636 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -53,6 +53,7 @@ void wt_status_prepare(struct wt_status *s)
        s->branch = head ? xstrdup(head) : NULL;
        s->reference = "HEAD";
        s->fp = stdout;
+       s->index_file = get_index_file();
 }
 
 static void wt_status_print_cached_header(struct wt_status *s)
@@ -198,7 +199,7 @@ static void wt_status_print_changed_cb(struct diff_queue_struct *q,
 static void wt_read_cache(struct wt_status *s)
 {
        discard_cache();
-       read_cache();
+       read_cache_from(s->index_file);
 }
 
 static void wt_status_print_initial(struct wt_status *s)

diff --git a/wt-status.h b/wt-status.h
index 4f3a615c32bb15bd67cb0a467a7114453fc9a6f1..77449326dbec5c3f83559c300aec2922445829ef 100644 (file)
--- a/wt-status.h
+++ b/wt-status.h
@@ -21,6 +21,7 @@ struct wt_status {
        int commitable;
        int workdir_dirty;
        int workdir_untracked;
+       const char *index_file;
        FILE *fp;
 };