From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2024 21:27:07 +0000 (-0700)
Subject: Meta/Reintegrate: -u should generate just once
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b9ca896d2a7d333f7f66debdfeac82ba2d6f1af;p=thirdparty%2Fgit.git

Meta/Reintegrate: -u should generate just once
---

diff --git a/Reintegrate b/Reintegrate
index 63340a9db5..cb5040405b 100755
--- 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