mirror of
https://github.com/git/git.git
synced 2026-08-09 09:34:14 +00:00
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.
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user