summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorThibault Saunier <tsaunier@igalia.com>2021-09-26 19:37:07 -0300
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2021-09-28 15:50:27 +0000
commitc722bedf1d303368c1d066f37815cb767f3be168 (patch)
tree9e1dad0597063d24a46cfac3cd2b16b76b8f2585 /scripts
parent6d2f033dbbd7fe4086ba287b9dc7fdfdb7b4b193 (diff)
downloadgstreamer-c722bedf1d303368c1d066f37815cb767f3be168.tar.gz
move-mrs-script: Get back to checked out branch
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/919>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/move_mrs_to_monorepo.py8
1 files changed, 8 insertions, 0 deletions
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
@@ -237,6 +237,12 @@ class GstMRMover:
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()
from_projects, to_project = self.fetch_projects()
@@ -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... ")