undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-diff: do not fall back on --cc when -[123], --ours etc. are given.

Browse Source 
These flags ask diff with a specific unmerged stage, so it
should fall back on -p instead.  Also when -c is given, we
should not do --cc.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-02-06 11:17:56 -08:00
parent a2c641c4ab
commit f22fd75c6a
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
git-diff.sh
View File

@ -22,14 +22,23 @@ case "$rev" in
esac
esac
# If we do not have --name-status, --name-only nor -r, default to --cc.
# If we do not have -B nor -C, default to -M.
# If we have -[123] --ours --theirs --base, don't do --cc by default.
case " $flags " in
*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* )
*" '-"[123]"' "* | *" '--ours' "* | *" '--base' "* | *" '--theirs' "*)
cc_or_p=-p ;;
*)
cc_or_p=--cc ;;
esac
# If we do not have --name-status, --name-only, -r, or -c default to --cc.
case " $flags " in
*" '--name-status' "* | *" '--name-only' "* | *" '-r' "* | *" '-c' "* )
;;
*)
flags="$flags'--cc' " ;;
flags="$flags'$cc_or_p' " ;;
esac
# If we do not have -B nor -C, default to -M.
case " $flags " in
*" '-"[BCM]* | *" '--find-copies-harder' "*)
;; # something like -M50.