Make 'git diff --cached' synonymous to 'git diff --cached HEAD'.
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>
Junio C Hamano committed
Sep 23, 2005 at 00:53 UTC
9f92f15f897fa1a943bcec324032cc4ca1f73ecf
1 file changed
+13
-1
git-diff.sh
+13
-1
@@ -9,9 +9,21 @@ files=$(git-rev-parse --no-revs --no-flags --sq "$@")
9
10
: ${flags:="'-M' '-p'"}
11
12
+# I often say 'git diff --cached -p' and get scolded by git-diff-files, but
13
+# obviously I mean 'git diff --cached -p HEAD' in that case.
14
+case "$rev" in
15
+'')
16
+ case " $flags " in
17
+ *" '--cached' "*)
18
+ rev='HEAD '
19
+ ;;
20
+ esac
21
+esac
22
+
23
case "$rev" in
24
?*' '?*' '?*)
14
- die "I don't understand"
25
+ echo >&2 "I don't understand"
26
+ exit 1
27
;;
28
?*' '^?*)
29
begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') &&