Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
submodule: whitespace fix
[gitweb.git]
/
diff-lib.c
diff --git
a/diff-lib.c
b/diff-lib.c
index 2e09500c8210e22d6c81484aa198f1d811a9933d..b3797592c63a86b46a3af0d875b6fe04ea43f536 100644
(file)
--- 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;
}