Linus Torvalds | 940c1bb | 2005-06-13 15:09:34 -0700 | [diff] [blame] | 1 | #!/bin/sh |
Junio C Hamano | 0a5a9ea | 2005-08-23 13:18:00 -0700 | [diff] [blame] | 2 | # |
| 3 | # Copyright (c) 2005 Linus Torvalds |
| 4 | # Copyright (c) 2005 Junio C Hamano |
| 5 | |
Fredrik Kuivinen | 92811b5 | 2005-12-15 23:47:57 +0100 | [diff] [blame] | 6 | USAGE='[ --diff-options ] <ent>{0,2} [<path>...]' |
| 7 | SUBDIRECTORY_OK='Yes' |
| 8 | . git-sh-setup |
| 9 | |
Junio C Hamano | 0a5a9ea | 2005-08-23 13:18:00 -0700 | [diff] [blame] | 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 | |
Junio C Hamano | 9f92f15 | 2005-09-23 00:53:02 -0700 | [diff] [blame] | 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 | |
Junio C Hamano | f22fd75 | 2006-02-06 11:17:56 -0800 | [diff] [blame] | 25 | # If we have -[123] --ours --theirs --base, don't do --cc by default. |
Junio C Hamano | 5620518 | 2005-11-29 21:59:04 -0800 | [diff] [blame] | 26 | case " $flags " in |
Junio C Hamano | f22fd75 | 2006-02-06 11:17:56 -0800 | [diff] [blame] | 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' "* ) |
Junio C Hamano | 5620518 | 2005-11-29 21:59:04 -0800 | [diff] [blame] | 36 | ;; |
| 37 | *) |
Junio C Hamano | f22fd75 | 2006-02-06 11:17:56 -0800 | [diff] [blame] | 38 | flags="$flags'$cc_or_p' " ;; |
Junio C Hamano | 5620518 | 2005-11-29 21:59:04 -0800 | [diff] [blame] | 39 | esac |
Junio C Hamano | f22fd75 | 2006-02-06 11:17:56 -0800 | [diff] [blame] | 40 | |
Junio C Hamano | 42efbf6 | 2006-03-11 17:44:10 -0800 | [diff] [blame] | 41 | # If we do not have -B, -C, -r, nor -p, default to -M. |
Junio C Hamano | 5620518 | 2005-11-29 21:59:04 -0800 | [diff] [blame] | 42 | case " $flags " in |
Junio C Hamano | 42efbf6 | 2006-03-11 17:44:10 -0800 | [diff] [blame] | 43 | *" '-"[BCMrp]* | *" '--find-copies-harder' "*) |
Junio C Hamano | 5620518 | 2005-11-29 21:59:04 -0800 | [diff] [blame] | 44 | ;; # something like -M50. |
| 45 | *) |
| 46 | flags="$flags'-M' " ;; |
| 47 | esac |
| 48 | |
Junio C Hamano | 0a5a9ea | 2005-08-23 13:18:00 -0700 | [diff] [blame] | 49 | case "$rev" in |
| 50 | ?*' '?*' '?*) |
Fredrik Kuivinen | 92811b5 | 2005-12-15 23:47:57 +0100 | [diff] [blame] | 51 | usage |
Junio C Hamano | 0a5a9ea | 2005-08-23 13:18:00 -0700 | [diff] [blame] | 52 | ;; |
| 53 | ?*' '^?*) |
| 54 | begin=$(expr "$rev" : '.*^.\([0-9a-f]*\).*') && |
| 55 | end=$(expr "$rev" : '.\([0-9a-f]*\). .*') || exit |
Linus Torvalds | ea51d41 | 2005-10-18 00:16:45 -0700 | [diff] [blame] | 56 | cmd="git-diff-tree $flags $begin $end -- $files" |
Junio C Hamano | 0a5a9ea | 2005-08-23 13:18:00 -0700 | [diff] [blame] | 57 | ;; |
| 58 | ?*' '?*) |
Linus Torvalds | ea51d41 | 2005-10-18 00:16:45 -0700 | [diff] [blame] | 59 | cmd="git-diff-tree $flags $rev -- $files" |
Junio C Hamano | 0a5a9ea | 2005-08-23 13:18:00 -0700 | [diff] [blame] | 60 | ;; |
| 61 | ?*' ') |
Linus Torvalds | ea51d41 | 2005-10-18 00:16:45 -0700 | [diff] [blame] | 62 | cmd="git-diff-index $flags $rev -- $files" |
Junio C Hamano | 0a5a9ea | 2005-08-23 13:18:00 -0700 | [diff] [blame] | 63 | ;; |
| 64 | '') |
Linus Torvalds | ea51d41 | 2005-10-18 00:16:45 -0700 | [diff] [blame] | 65 | cmd="git-diff-files $flags -- $files" |
Junio C Hamano | 0a5a9ea | 2005-08-23 13:18:00 -0700 | [diff] [blame] | 66 | ;; |
Linus Torvalds | 940c1bb | 2005-06-13 15:09:34 -0700 | [diff] [blame] | 67 | *) |
Fredrik Kuivinen | 92811b5 | 2005-12-15 23:47:57 +0100 | [diff] [blame] | 68 | usage |
Junio C Hamano | 0a5a9ea | 2005-08-23 13:18:00 -0700 | [diff] [blame] | 69 | ;; |
Linus Torvalds | 940c1bb | 2005-06-13 15:09:34 -0700 | [diff] [blame] | 70 | esac |
Junio C Hamano | 0a5a9ea | 2005-08-23 13:18:00 -0700 | [diff] [blame] | 71 | |
| 72 | eval "$cmd" |