From 5eb7a57af4a76621b4f4b4c7e3e466ac668ee2f4 Mon Sep 17 00:00:00 2001 From: Joseph Eng Date: Tue, 16 Jul 2024 15:15:23 -0700 Subject: [PATCH] Set root tag after applying patches in reset() --- upstream_utils/upstream_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upstream_utils/upstream_utils.py b/upstream_utils/upstream_utils.py index 6512374adb5..7c91530949d 100644 --- a/upstream_utils/upstream_utils.py +++ b/upstream_utils/upstream_utils.py @@ -454,10 +454,10 @@ def reset(self): subprocess.run(["git", "switch", "--detach", self.old_tag]) - self.set_root_tag(self.old_tag) - self.apply_patches() + self.set_root_tag(self.old_tag) + def rebase(self, new_tag): """Rebases the patches.