From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2013 17:21:31 +0000 (-0700)
Subject: Meta/Reintegrate: ignroe whitespace when comparing list of topics
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cc72ca00b6b1b17ae2113fa254eed63cc64fe99;p=thirdparty%2Fgit.git

Meta/Reintegrate: ignroe whitespace when comparing list of topics

Often topics that are ready to advance are marked by indenting them
before moving.  Ignore these changes when comparing.
---

diff --git a/Reintegrate b/Reintegrate
index 0266e712f4..45e384c0aa 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -267,7 +267,7 @@ then
 	generate "$0" "$@"
 elif test -z "$diff"
 then
-	generate "$0" "$@" | diff -u "$update" -
+	generate "$0" "$@" | diff -w -u "$update" -
 	if test $? = 0
 	then
 		echo >&2 "No changes."
@@ -283,5 +283,5 @@ then
 		esac
 	fi
 else
-	generate "$0" "$@" | diff -u "$update" -
+	generate "$0" "$@" | diff -w -u "$update" -
 fi