Merge branch 'jc/maint-reset-unmerged-path' into maint

* jc/maint-reset-unmerged-path: reset [<commit>] paths...: do not mishandle unmerged paths
2011-08-16 11:41:28 -07:00
parent b5e104a0e6 ff00b682f2
commit 7aa50897dd
3 changed files with 18 additions and 2 deletions
--- 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;
 	}