aboutsummaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-11 16:46:20 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-11 16:46:20 -0800
commite0197c9aae39b0f1ba6c21d1f6d0bae5de03a44d (patch)
tree8ce3be12cc0fba866845b18e977c264fbcf54792 /wt-status.c
parent3960a951795819e6cd09422e15092b45cdd46f73 (diff)
parent9cb76b8cdc8ac62a77080595f6443613fd64bab3 (diff)
downloadgit-e0197c9aae39b0f1ba6c21d1f6d0bae5de03a44d.tar.gz
git-e0197c9aae39b0f1ba6c21d1f6d0bae5de03a44d.tar.xz
Merge branch 'lt/in-core-index'
* lt/in-core-index: lazy index hashing Create pathname-based hash-table lookup into index read-cache.c: introduce is_racy_timestamp() helper read-cache.c: fix a couple more CE_REMOVE conversion Also use unpack_trees() in do_diff_cache() Make run_diff_index() use unpack_trees(), not read_tree() Avoid running lstat(2) on the same cache entry. index: be careful when handling long names Make on-disk index representation separate from in-core one
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/wt-status.c b/wt-status.c
index bfd1b0fcc..f14022f2a 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -217,19 +217,12 @@ static void wt_status_print_changed_cb(struct diff_queue_struct *q,
wt_status_print_trailer(s);
}
-static void wt_read_cache(struct wt_status *s)
-{
- discard_cache();
- read_cache_from(s->index_file);
-}
-
static void wt_status_print_initial(struct wt_status *s)
{
int i;
struct strbuf buf;
strbuf_init(&buf, 0);
- wt_read_cache(s);
if (active_nr) {
s->commitable = 1;
wt_status_print_cached_header(s);
@@ -256,7 +249,6 @@ static void wt_status_print_updated(struct wt_status *s)
rev.diffopt.detect_rename = 1;
rev.diffopt.rename_limit = 100;
rev.diffopt.break_opt = 0;
- wt_read_cache(s);
run_diff_index(&rev, 1);
}
@@ -268,7 +260,6 @@ static void wt_status_print_changed(struct wt_status *s)
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = wt_status_print_changed_cb;
rev.diffopt.format_callback_data = s;
- wt_read_cache(s);
run_diff_files(&rev, 0);
}
@@ -335,7 +326,6 @@ static void wt_status_print_verbose(struct wt_status *s)
setup_revisions(0, NULL, &rev, s->reference);
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
rev.diffopt.detect_rename = 1;
- wt_read_cache(s);
run_diff_index(&rev, 1);
fflush(stdout);