]>
Commit | Line | Data |
---|---|---|
940c1bb0 | 1 | #!/bin/sh |
0a5a9ea4 JH |
2 | # |
3 | # Copyright (c) 2005 Linus Torvalds | |
4 | # Copyright (c) 2005 Junio C Hamano | |
5 | ||
92811b57 FK |
6 | USAGE='[ --diff-options ] <ent>{0,2} [<path>...]' |
7 | SUBDIRECTORY_OK='Yes' | |
8 | . git-sh-setup | |
9 | ||
0a5a9ea4 JH |
10 | rev=$(git-rev-parse --revs-only --no-flags --sq "$@") || exit |
11 | flags=$(git-rev-parse --no-revs --flags --sq "$@") | |
12 | files=$(git-rev-parse --no-revs --no-flags --sq "$@") | |
13 | ||
9f92f15f JH |
14 | # I often say 'git diff --cached -p' and get scolded by git-diff-files, but |
15 | # obviously I mean 'git diff --cached -p HEAD' in that case. | |
16 | case "$rev" in | |
17 | '') | |
18 | case " $flags " in | |
19 | *" '--cached' "*) | |
20 | rev='HEAD ' | |
21 | ;; | |
22 | esac | |
23 | esac | |
24 | ||
f22fd75c | 25 | # If we have -[123] --ours --theirs --base, don't do --cc by default. |
56205180 | 26 | case " $flags " in |
f22fd75c JH |
27 | *" '-"[123]"' "* | *" '--ours' "* | *" '--base' "* | *" '--theirs' "*) |
28 | cc_or_p=-p ;; | |
29 | *) | |
30 | cc_or_p=--cc ;; | |
31 | esac | |
32 | ||
33 | # If we do not have --name-status, --name-only, -r, or -c default to --cc. | |
34 | case " $flags " in | |
35 | *" '--name-status' "* | *" '--name-only' "* | *" '-r' "* | *" '-c' "* ) | |
56205180 JH |
36 | ;; |
37 | *) | |
f22fd75c | 38 | flags="$flags'$cc_or_p' " ;; |
56205180 | 39 | esac |
f22fd75c JH |
40 | |
41 | # If we do not have -B nor -C, default to -M. | |
56205180 JH |
42 | case " $flags " in |
43 | *" '-"[BCM]* | *" '--find-copies-harder' "*) | |
44 | ;; # something like -M50. | |
45 | *) | |
46 | flags="$flags'-M' " ;; | |
47 | esac | |
48 | ||
0a5a9ea4 JH |
49 | case "$rev" in |
50 | ?*' '?*' '?*) | |
92811b57 | 51 | usage |
0a5a9ea4 JH |
52 | ;; |
53 | ?*' '^?*) | |
54 | begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') && | |
55 | end=$(expr "$rev" : '.\([0-9a-f]*\). .*') || exit | |
ea51d416 | 56 | cmd="git-diff-tree $flags $begin $end -- $files" |
0a5a9ea4 JH |
57 | ;; |
58 | ?*' '?*) | |
ea51d416 | 59 | cmd="git-diff-tree $flags $rev -- $files" |
0a5a9ea4 JH |
60 | ;; |
61 | ?*' ') | |
ea51d416 | 62 | cmd="git-diff-index $flags $rev -- $files" |
0a5a9ea4 JH |
63 | ;; |
64 | '') | |
ea51d416 | 65 | cmd="git-diff-files $flags -- $files" |
0a5a9ea4 | 66 | ;; |
940c1bb0 | 67 | *) |
92811b57 | 68 | usage |
0a5a9ea4 | 69 | ;; |
940c1bb0 | 70 | esac |
0a5a9ea4 JH |
71 | |
72 | eval "$cmd" |