summaryrefslogtreecommitdiff
path: root/git-external-diff-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-10-04 06:47:19 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-04 06:47:19 (GMT)
commite9b2e586181ae7631a048b88221fb857706900e9 (patch)
tree5e79ea85ca45b3484df3a1cc2b70b8490930ae0e /git-external-diff-script
parent70a0c6fe39da7e3f68836051408bc8eb3ce60ba7 (diff)
downloadgit-e9b2e586181ae7631a048b88221fb857706900e9.zip
git-e9b2e586181ae7631a048b88221fb857706900e9.tar.gz
git-e9b2e586181ae7631a048b88221fb857706900e9.tar.bz2
Remove unused external-diff script.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-external-diff-script')
-rwxr-xr-xgit-external-diff-script67
1 files changed, 0 insertions, 67 deletions
diff --git a/git-external-diff-script b/git-external-diff-script
deleted file mode 100755
index 137280a..0000000
--- a/git-external-diff-script
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2005 Junio C Hamano
-#
-# This script is designed to emulate what the built-in diff driver
-# does when set as GIT_EXTERNAL_SCRIPT.
-
-case "$#" in
-1)
- echo "* Unmerged path $1"
- exit 0 ;;
-*)
- name1="$1" tmp1="$2" hex1="$3" mode1="$4" tmp2="$5" hex2="$6" mode2="$7"
- case "$#" in
- 7)
- name2="$name1" ;;
- 9)
- name2="$8" xfrm_msg="$9" ;;
- esac ;;
-esac
-
-show_create () {
- name_="$1" tmp_="$2" hex_="$3" mode_="$4"
- echo "diff --git a/$name_ b/$name_"
- echo "new file mode $mode_"
- diff ${GIT_DIFF_OPTS-'-pu'} -L /dev/null -L "b/$name_" /dev/null "$tmp_"
-}
-
-show_delete () {
- name_="$1" tmp_="$2" hex_="$3" mode_="$4"
- echo "diff --git a/$name_ b/$name_"
- echo "deleted file mode $mode_"
- diff ${GIT_DIFF_OPTS-'-pu'} -L "a/$name_" -L /dev/null "$tmp_" /dev/null
-}
-
-case "$mode1" in
-120*) type1=l ;;
-100*) type1=f ;;
-.) show_create "$name2" "$tmp2" "$hex2" "$mode2"
- exit 0 ;;
-esac
-case "$mode2" in
-120*) type2=l ;;
-100*) type2=f ;;
-.) show_delete "$name1" "$tmp1" "$hex1" "$mode1"
- exit 0 ;;
-esac
-
-if test "$type1" != "$type2"
-then
- show_delete "$name1" "$tmp1" "$hex1" "$mode1"
- show_create "$name2" "$tmp2" "$hex2" "$mode2"
- exit 0
-fi
-
-echo diff --git "a/$name1" "b/$name2"
-if test "$mode1" != "$mode2"
-then
- echo "old mode $mode1"
- echo "new mode $mode2"
- if test "$xfrm_msg" != ""
- then
- echo "$xfrm_msg"
- fi
-fi
-diff ${GIT_DIFF_OPTS-'-pu'} -L "a/$name1" -L "b/$name2" "$tmp1" "$tmp2"
-exit 0
-