summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-24 02:20:13 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-24 02:20:13 -0800
commitefdfd6c8d418a2c12f31cacb50fa8a91b2b868c8 (patch)
tree93a5eea7b3887a2a58583bf249f1d556019ba418 /diff-lib.c
parentd516c2d11945cf13ed3d961fa63817c60b7a566b (diff)
parentb4e1e4a787d3771f617182b3344dcdd9224bd0cb (diff)
downloadgit-efdfd6c8d418a2c12f31cacb50fa8a91b2b868c8.tar.gz
Evil Merge branch 'jc/status' (early part) into js/diff-ni
* 'jc/status' (early part): run_diff_{files,index}(): update calling convention. update-index: do not die too early in a read-only repository. git-status: do not be totally useless in a read-only repository. This is to resolve semantic conflict (which is not textual) that changes the calling convention of run_diff_files() early.
Diffstat (limited to 'diff-lib.c')
-rw-r--r--diff-lib.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/diff-lib.c b/diff-lib.c
index a9b5149d1b..1d184422a5 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -217,6 +217,10 @@ int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv)
return 0;
}
+ if (read_cache() < 0) {
+ perror("read_cache");
+ return -1;
+ }
return run_diff_files(revs, silent_on_removed);
}
@@ -227,11 +231,7 @@ int run_diff_files(struct rev_info *revs, int silent_on_removed)
if (diff_unmerged_stage < 0)
diff_unmerged_stage = 2;
- entries = read_cache();
- if (entries < 0) {
- perror("read_cache");
- return -1;
- }
+ entries = active_nr;
for (i = 0; i < entries; i++) {
struct stat st;
unsigned int oldmode, newmode;
@@ -559,10 +559,6 @@ int run_diff_index(struct rev_info *revs, int cached)
if (!revs->ignore_merges)
match_missing = 1;
- if (read_cache() < 0) {
- perror("read_cache");
- return -1;
- }
mark_merge_entries();
ent = revs->pending.objects[0].item;