Skip to content

Commit

Permalink
Make 'git diff --cached' synonymous to 'git diff --cached HEAD'.
Browse files Browse the repository at this point in the history
When making changes to different files (i.e. dirty working tree) and
committing logically separate changes in groups, often it is necessary
to run 'git diff --cached HEAD' to make sure that the changes being
committed makes sense.  Saying 'git diff --cached' by mistake gives
rather uninformative error message from git-diff-files complaining it
does not understand --cached flag.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Sep 23, 2005
1 parent 2c08b36 commit 9f92f15
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion git-diff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,21 @@ files=$(git-rev-parse --no-revs --no-flags --sq "$@")

: ${flags:="'-M' '-p'"}

# I often say 'git diff --cached -p' and get scolded by git-diff-files, but
# obviously I mean 'git diff --cached -p HEAD' in that case.
case "$rev" in
'')
case " $flags " in
*" '--cached' "*)
rev='HEAD '
;;
esac
esac

case "$rev" in
?*' '?*' '?*)
die "I don't understand"
echo >&2 "I don't understand"
exit 1
;;
?*' '^?*)
begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') &&
Expand Down

0 comments on commit 9f92f15

Please sign in to comment.