[PATCH] Do not run useless show-diff on unmerged paths repeatedly.
commit9fec8b26eff58e1f595e8619abf1e42c07645ff8
authorJunio C Hamano <junkio@cox.net>
Sun, 17 Apr 2005 04:29:45 +0000 (16 21:29 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 17 Apr 2005 04:29:45 +0000 (16 21:29 -0700)
tree0776ebe16d603a16a3540ae78504abe6b0920ac0
parentd2522a6528a1212933e71c592950097bcfe64e7d
[PATCH] Do not run useless show-diff on unmerged paths repeatedly.

When run on unmerged dircache, show-diff compares the working
file with each non-empty stage for that path.  Two out of three
times, this is not very helpful.  This patch makes it report the
unmergedness only once per each path and avoids running the
actual diff.

Upper layer SCMs like Cogito are expected to find out mode/SHA1
for each stage by using "show-files --stage" and run the diff
itself.  This would result in more sensible diffs.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
show-diff.c