1 files changed, 29 insertions, 0 deletions
diff --git a/app-misc/icdiff/files/icdiff-1.9.5-tests.patch b/app-misc/icdiff/files/icdiff-1.9.5-tests.patch
new file mode 100644
index 000000000000..3e2467460d2c
--- /dev/null
+++ b/app-misc/icdiff/files/icdiff-1.9.5-tests.patch
@@ -0,0 +1,29 @@
+diff --git a/test.sh b/test.sh
+index fd1679e..5b756f3 100755
+--- a/test.sh
++++ b/test.sh
+@@ -86,6 +86,8 @@ function check_git_diff() {
+   local gitdiff=tests/$1
+   shift
+ 
++  # does not work with newer versions of git
++  if false; then
+   echo "    check_gitdiff $gitdiff matches git icdiff $@"
+   # Check when using icdiff in git
+   if $FIRST_TIME_CHECK_GIT_DIFF; then
+@@ -96,13 +98,14 @@ function check_git_diff() {
+     export PATH=$PATH:"$(pwd)"
+   fi
+   local tmp=/tmp/git-icdiff.output
+-  git icdiff $1 $2 &> $tmp
++  git icdiff --no-index $1 $2 &> $tmp
+   if ! diff $tmp $gitdiff; then
+     echo "Got: ($tmp)"
+     cat $tmp
+     echo "Expected: ($gitdiff)"
+     fail
+   fi
++  fi
+ }
+ 
+ check_gold gold-recursive.txt       --recursive tests/{a,b} --cols=80