Meta/Reintegrate: -u should generate just once

diff --git a/Reintegrate b/Reintegrate
index 63340a9db583a70015683d40c1fe8dc15b9ed26e..cb5040405b34807deb411fa16f072cd3f852a16c 100755 (executable)
--- a/Reintegrate
+++ b/Reintegrate
@@ -389,7 +389,10 @@ then
        generate "$0" "$@"
 elif test -z "$diff"
 then
-       generate "$0" "$@" | diff -w -u "$update" -
+       tmp=/tmp/regenerate.$$
+       trap 'rm -f "$tmp"*' 0
+       generate "$0" "$@" >"$tmp"
+       diff -w -u "$update" "$tmp"
        if test $? = 0
        then
                echo >&2 "No changes."
@@ -398,8 +401,7 @@ then
                read yesno
                case "$yesno" in
                [Yy]*)
-                       generate "$0" "$@" |
-                       sed -e 's/ :rebased?.*//' >"$update" ;;
+                       sed -e 's/ :rebased?.*//' "$tmp" >"$update" ;;
                *)
                        echo >&2 "No update then." ;;
                esac