]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Reintegrate: ignroe whitespace when comparing list of topics
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:21:31 +0000 (10:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:21:31 +0000 (10:21 -0700)
Often topics that are ready to advance are marked by indenting them
before moving.  Ignore these changes when comparing.

Reintegrate

index 0266e712f414311009b031b18f13ab3315e55fbd..45e384c0aab486e6a669ea215e1baa42d1e6af40 100755 (executable)
@@ -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