From e21fe49dc94730e45dcafe29859dfe68eea08fc2 Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Wed, 3 Oct 2018 14:21:20 -0700
Subject: [PATCH] Update "diff-pr" flags to be more aggressive about looking
 for similar files

---
 diff-pr.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/diff-pr.sh b/diff-pr.sh
index aabb50a79..714dfeda5 100755
--- a/diff-pr.sh
+++ b/diff-pr.sh
@@ -72,7 +72,7 @@ git -C oi fetch --quiet \
 
 images=( "$@" )
 if [ "${#images[@]}" -eq 0 ]; then
-	images=( $(git -C oi/library diff --name-only master...pull -- . | xargs -n1 basename) )
+	images=( $(git -C oi/library diff --name-only HEAD...pull -- . | xargs -n1 basename) )
 fi
 
 export BASHBREW_CACHE="${BASHBREW_CACHE:-${XDG_CACHE_HOME:-$HOME/.cache}/bashbrew}"
@@ -232,4 +232,12 @@ copy-tar tar temp
 rm -rf tar
 git -C temp add .
 
-git -C temp diff --minimal --ignore-all-space --find-copies="$findCopies" --find-copies-harder --irreversible-delete --staged
+git -C temp diff \
+	--minimal \
+	--ignore-all-space \
+	--find-renames="$findCopies" \
+	--break-rewrites \
+	--find-copies="$findCopies" \
+	--find-copies-harder \
+	--irreversible-delete \
+	--staged