From c722bedf1d303368c1d066f37815cb767f3be168 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@igalia.com>
Date: Sun, 26 Sep 2021 19:37:07 -0300
Subject: move-mrs-script: Get back to checked out branch

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/919>
---
 scripts/move_mrs_to_monorepo.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'scripts')

diff --git a/scripts/move_mrs_to_monorepo.py b/scripts/move_mrs_to_monorepo.py
index bb4592b9d0..7f7735ab1e 100755
--- a/scripts/move_mrs_to_monorepo.py
+++ b/scripts/move_mrs_to_monorepo.py
@@ -236,6 +236,12 @@ class GstMRMover:
                 raise e
 
     def run(self):
+        try:
+            prevbranch = self.git("rev-parse", "--abbrev-ref", "HEAD", can_fail=True).strip()
+        except:
+            fprint(bold(yellow("Not on a branch?\n")), indent=False)
+            prevbranch = None
+
         try:
             self.setup_repo()
 
@@ -246,6 +252,8 @@ class GstMRMover:
         finally:
             if self.git_rename_limit is not None:
                 self.git("config", "merge.renameLimit", str(self.git_rename_limit))
+            if prevbranch:
+                self.git("checkout", prevbranch)
 
     def fetch_projects(self):
         fprint("Fetching projects... ")
-- 
cgit v1.2.1