From 00c2d83c62603a13f54c5037f08d43591a29d6fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 18 Nov 2024 15:23:41 +0100
Subject: git: gitbmerge sleep 1 second between push and branch removal
 upstream

This ensures that Gitlab processes the master update before we remove
branch and thus close merge request.
---
 shellrc.d/git | 1 +
 1 file changed, 1 insertion(+)

(limited to 'shellrc.d')

diff --git a/shellrc.d/git b/shellrc.d/git
index 15b949a..18b3b79 100644
--- a/shellrc.d/git
+++ b/shellrc.d/git
@@ -47,6 +47,7 @@ gitbmerge() (
 		fi
 		git merge --ff-only "$branch" \
 			&& git push \
+			&& sleep 1 \
 			&& git branch -d "$branch" \
 			&& { if [ -n "$upstream" ]; then git push origin :"$branch"; fi; }
 )
-- 
cgit v1.2.3