Browse Source

Use the new git-rev-parse "--[no-]flags" in "git diff".

This allows you to do

	git diff v2.6.12..v2.6.13-rc1 drivers/pcmcia

to see the diff between v2.6.12 and v2.6.13-rc1 as limited by the
filename argument.
maint
Linus Torvalds 20 years ago
parent
commit
9e9824ba0e
  1. 5
      git-diff-script

5
git-diff-script

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
rev=($(git-rev-parse --revs-only "$@")) rev=($(git-rev-parse --revs-only "$@"))
flags=($(git-rev-parse --no-revs "$@")) flags=($(git-rev-parse --no-revs --flags "$@"))
files=($(git-rev-parse --no-revs --no-flags "$@"))
case "${#rev[*]}" in case "${#rev[*]}" in
0) 0)
git-diff-files -M -p "$@";; git-diff-files -M -p "$@";;
@ -9,7 +10,7 @@ case "${#rev[*]}" in
2) 2)
begin=$(echo "${rev[1]}" | tr -d '^') begin=$(echo "${rev[1]}" | tr -d '^')
end="${rev[0]}" end="${rev[0]}"
git-diff-tree -M -p $flags $begin $end;; git-diff-tree -M -p $flags $begin $end $files;;
*) *)
echo "I don't understand" echo "I don't understand"
exit 1;; exit 1;;

Loading…
Cancel
Save