X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff-lib.c;h=b3797592c63a86b46a3af0d875b6fe04ea43f536;hb=9dcca58db42e85e056c6523429204f367a671a0e;hp=2e09500c8210e22d6c81484aa198f1d811a9933d;hpb=ba9a247bf62a56c354bca640ba0ee131a3347864;p=git.git

diff --git a/diff-lib.c b/diff-lib.c
index 2e09500c8..b3797592c 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -379,7 +379,8 @@ static void do_oneway_diff(struct unpack_trees_options *o,
 	if (cached && idx && ce_stage(idx)) {
 		struct diff_filepair *pair;
 		pair = diff_unmerge(&revs->diffopt, idx->name);
-		fill_filespec(pair->one, idx->sha1, idx->ce_mode);
+		if (tree)
+			fill_filespec(pair->one, tree->sha1, tree->ce_mode);
 		return;
 	}