From 0a18e51a3292ced6d6ce198e4824111236c7fa6e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 25 Nov 2021 13:53:10 +0530
Subject: [PATCH] Dont do qt6 transition when rebase in progress

---
 setup/git_post_checkout_hook.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup/git_post_checkout_hook.py b/setup/git_post_checkout_hook.py
index ccacb2e00f..9b34c85783 100755
--- a/setup/git_post_checkout_hook.py
+++ b/setup/git_post_checkout_hook.py
@@ -18,8 +18,9 @@ os.chdir(base)
 
 if flags == '1':  # A branch checkout
     prev_branch, cur_branch = list(map(get_branch_name, (prev_rev, current_rev)))
+    rebase_in_progress = os.path.exists('.git/rebase-apply') or os.path.exists('.git/rebase-merge')
 
-    if {prev_branch, cur_branch} == {'master', 'qt6'}:
+    if {prev_branch, cur_branch} == {'master', 'qt6'} and not rebase_in_progress:
         b = 'qt6' if cur_branch == 'qt6' else 'qt5'
         for x in os.listdir(f'bypy/b/{b}'):
             link = f'bypy/b/{x}'