Merge pull request #3253 from efiop/3241

install: fix post-checkout hook
2026-11-02 07:18:25 +01:00 · 2020-01-30 12:02:55 +02:00
parent 90773ed4f3 13ed7a1c32
commit 14075c4658
1 changed files with 4 additions and 3 deletions
@@ -275,9 +275,10 @@ class Git(Base):
            [
                # checking out some reference and not specific file.
                '[ "$3" = "1" ]',
-                # check that we are on some branch/tag and not in detached HEAD
-                # state, so we don't accidentally break a rebase.
-                '[ "$(git rev-parse --abbrev-ref HEAD)" != "HEAD" ]',
+                # make sure we are not in the middle of a rebase/merge, so we
+                # don't accidentally break it with an unsuccessful checkout.
+                # Note that git hooks are always running in repo root.
+                "[ ! -d .git/rebase-merge ]",
            ],
            "checkout",
        )