Code

diff-cache shows differences for unmerged paths without --cache.
authorJunio C Hamano <junkio@cox.net>
Thu, 5 May 2005 22:35:49 +0000 (15:35 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 5 May 2005 22:35:49 +0000 (15:35 -0700)
commit660265909fc178581ef327076716dfd3550e6e7b
tree9fe5a9fe58366cdff6c54ab71ccdf58a59e982b7
parented4eeaf203d0f293bd5ffc2a0ad8711f052db1f3
diff-cache shows differences for unmerged paths without --cache.

While manually resolving a merge conflict, being able to run
diff-cache without --cache option between files in the work tree
and either of the ancestor trees is helpful to verify the hand
merged result.  However, diff-cache refuses to handle unmerged
paths, even when run without --cache option.

This changes the behaviour so that the above use case will
report the differences between the compared tree and the magic
0{40} SHA1 (i.e. "look at the work tree").  When there is no
corresponding file in the work tree, or when the command is run
with "--cache" option, it continues to report "unmerged".

Signed-off-by: Junio C Hamano <junkio@cox.net>
diff-cache.c