Meta/Reintegrate: -u should generate just once
Junio C Hamano committed
Jul 11, 2024 at 14:27 UTC
9b9ca896d2a7d333f7f66debdfeac82ba2d6f1af
1 file changed
+5
-3
Reintegrate
+5
-3
@@ -389,7 +389,10 @@ then
389
generate "$0" "$@"
390
elif test -z "$diff"
391
then
392
- generate "$0" "$@" | diff -w -u "$update" -
392
+ tmp=/tmp/regenerate.$$
393
+ trap 'rm -f "$tmp"*' 0
394
+ generate "$0" "$@" >"$tmp"
395
+ diff -w -u "$update" "$tmp"
396
if test $? = 0
397
then
398
echo >&2 "No changes."
@@ -398,8 +401,7 @@ then
401
read yesno
402
case "$yesno" in
403
[Yy]*)
401
- generate "$0" "$@" |
402
- sed -e 's/ :rebased?.*//' >"$update" ;;
404
+ sed -e 's/ :rebased?.*//' "$tmp" >"$update" ;;
405
*)
406
echo >&2 "No update then." ;;
407
esac