Meta/onemerge: clean temporary files correctly and exit non-zero upon failure
Junio C Hamano committed
Jul 21, 2026 at 12:23 UTC
26a198328d95f141256901f8f42689e6c07ed9f9
1 file changed
+2
-3
onemerge.sh
+2
-3
index 4d353ea0ef..309290df50 100755
--- a/onemerge.sh
+++ b/onemerge.sh
@@ -15,7 +15,7 @@ fi
tmp=/var/tmp/e.$$
rm -f "$tmp.1" "$tmp.2" &&
prev= &&
-trap 'rm -f "$tmp.*"' 0 || exit
+trap 'rm -f "$tmp."*' 0 || exit
git rev-list --merges --first-parent master..$endpoint |
while read commit
@@ -33,8 +33,7 @@ do
echo Merges multiple topics
git show -s --format="* %s" "$prev"
comm -23 "$tmp.1" "$tmp.2"
- exit
-
+ exit 1
fi
fi
mv -f "$tmp.1" "$tmp.2"