From 5fe419ab86c57856254b3d85c69fc825e33c865d Mon Sep 17 00:00:00 2001 Message-Id: <5fe419ab86c57856254b3d85c69fc825e33c865d.1746539468.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 5 May 2007 15:58:07 +0200 Subject: [PATCH] Avoid contrib/stg-swallow deleting unrelated empty patches. Organization: Straylight/Edgeware From: Yann Dirson Let's just check ourselves if the patch is empty after pushing instead of using clean: no more surprise with patches getting abusively cleaned, and we should now be faster when there are many unapplied patches. Signed-off-by: Yann Dirson --- contrib/stg-swallow | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/stg-swallow b/contrib/stg-swallow index 5014f39..924c079 100755 --- a/contrib/stg-swallow +++ b/contrib/stg-swallow @@ -15,5 +15,9 @@ patch="$1" stg pick --fold "$patch" stg refresh stg push "$patch" + #stg clean "$patch" -stg pop; stg clean -u +#stg pop; stg clean -u +[ $(stg id "$patch//top") != $(stg id "$patch//bottom") ] || + { echo >&2 "Assertion failed: patch '$patch' is not empty after swallowing, not deleting it."; exit 1; } +stg delete "$patch" -- [mdw]