There is no more need for this tool since the --dir-dirr option was
introduced.
Cc: Tim Henigan tim.heni...@gmail.com
Signed-off-by: Felipe Contreras felipe.contre...@gmail.com
---
contrib/diffall/README | 31 --
contrib/diffall/git-diffall | 257
2 files changed, 288 deletions(-)
delete mode 100644 contrib/diffall/README
delete mode 100755 contrib/diffall/git-diffall
diff --git a/contrib/diffall/README b/contrib/diffall/README
deleted file mode 100644
index 507f17d..000
--- a/contrib/diffall/README
+++ /dev/null
@@ -1,31 +0,0 @@
-The git-diffall script provides a directory based diff mechanism
-for git.
-
-To determine what diff viewer is used, the script requires either
-the 'diff.tool' or 'merge.tool' configuration option to be set.
-
-This script is compatible with most common forms used to specify a
-range of revisions to diff:
-
- 1. git diffall: shows diff between working tree and staged changes
- 2. git diffall --cached [commit]: shows diff between staged
- changes and HEAD (or other named commit)
- 3. git diffall commit: shows diff between working tree and named
- commit
- 4. git diffall commit commit: show diff between two named commits
- 5. git diffall commit..commit: same as above
- 6. git diffall commit...commit: show the changes on the branch
- containing and up to the second, starting at a common ancestor
- of both commit
-
-Note: all forms take an optional path limiter [-- path*]
-
-The '--extcmd=command' option allows the user to specify a custom
-command for viewing diffs. When given, configured defaults are
-ignored and the script runs $command $LOCAL $REMOTE. Additionally,
-$BASE is set in the environment.
-
-This script is based on an example provided by Thomas Rast on the
-Git list [1]:
-
-[1] http://thread.gmane.org/gmane.comp.version-control.git/124807
diff --git a/contrib/diffall/git-diffall b/contrib/diffall/git-diffall
deleted file mode 100755
index 84f2b65..000
--- a/contrib/diffall/git-diffall
+++ /dev/null
@@ -1,257 +0,0 @@
-#!/bin/sh
-# Copyright 2010 - 2012, Tim Henigan tim.heni...@gmail.com
-#
-# Perform a directory diff between commits in the repository using
-# the external diff or merge tool specified in the user's config.
-
-USAGE='[--cached] [--copy-back] [-x|--extcmd=command] commit{0,2} [--
path*]
-
---cached Compare to the index rather than the working tree.
-
---copy-back Copy files back to the working tree when the diff
- tool exits (in case they were modified by the
- user). This option is only valid if the diff
- compared with the working tree.
-
--x=command
---extcmd=command Specify a custom command for viewing diffs.
- git-diffall ignores the configured defaults and
- runs $command $LOCAL $REMOTE when this option is
- specified. Additionally, $BASE is set in the
- environment.
-'
-
-SUBDIRECTORY_OK=1
-. $(git --exec-path)/git-sh-setup
-
-TOOL_MODE=diff
-. $(git --exec-path)/git-mergetool--lib
-
-merge_tool=$(get_merge_tool)
-if test -z $merge_tool
-then
- echo Error: Either the 'diff.tool' or 'merge.tool' option must be set.
- usage
-fi
-
-start_dir=$(pwd)
-
-# All the file paths returned by the diff command are relative to the root
-# of the working copy. So if the script is called from a subdirectory, it
-# must switch to the root of working copy before trying to use those paths.
-cdup=$(git rev-parse --show-cdup)
-cd $cdup || {
- echo 2 Cannot chdir to $cdup, the toplevel of the working tree
- exit 1
-}
-
-# set up temp dir
-tmp=$(perl -e 'use File::Temp qw(tempdir);
- $t=tempdir(/tmp/git-diffall.X) or exit(1);
- print $t') || exit 1
-trap 'rm -rf $tmp' EXIT
-
-left=
-right=
-paths=
-dashdash_seen=
-compare_staged=
-merge_base=
-left_dir=
-right_dir=
-diff_tool=
-copy_back=
-
-while test $# != 0
-do
- case $1 in
- -h|--h|--he|--hel|--help)
- usage
- ;;
- --cached)
- compare_staged=1
- ;;
- --copy-back)
- copy_back=1
- ;;
- -x|--e|--ex|--ext|--extc|--extcm|--extcmd)
- if test $# = 1
- then
- echo You must specify the tool for use with --extcmd
- usage
- else
- diff_tool=$2
- shift
- fi
- ;;
- --)
- dashdash_seen=1
- ;;
- -*)
- echo Invalid option: $1
- usage
- ;;
- *)
- # could be commit, commit range or path limiter
- case $1 in
- *...*)
- left=${1%...*}
- right=${1#*...}
- merge_base=1
- ;;
-
