Fix CURRENT_GIT_DIR setting in reference-transaction during git init 💚 💚

rycus86 · Oct 7, 2024 · 5f312c0 · 5f312c0
1 parent 89f5359
commit 5f312c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/base-template.sh b/base-template.sh
@@ -98,6 +98,10 @@ set_main_variables() {
     ACCEPT_CHANGES=
 
     CURRENT_GIT_DIR=$(git rev-parse --git-common-dir 2>/dev/null)
+    if [ -z "${CURRENT_GIT_DIR}" ] && [ -n "${GIT_DIR}" ]; then
+        # Patch up the current git dir when the above did not find it yet, perhaps during git init
+        CURRENT_GIT_DIR="${GIT_DIR}"
+    fi
     if [ ! -d "${CURRENT_GIT_DIR}" ]; then
         echo "! Hook not run inside a git repository" >&2
         return 1
@@ -405,12 +409,10 @@ is_trusted_repo() {
             fi
         fi
     fi
- 
+
     return 1
 }
 
-
-
 #####################################################
 # Performs checks for new and changed hooks,
 #   and prompts the user for approval if needed.

diff --git a/tests/step-061.sh b/tests/step-061.sh
@@ -15,9 +15,9 @@ mkdir -p /tmp/shared/first-shared.git/.githooks/pre-commit &&
 git config --global githooks.shared 'file:///tmp/shared/first-shared.git' || exit 1
 
 mkdir -p /tmp/test061/.githooks &&
-    echo '/tmp/shared/second-shared.git' >/tmp/test061/.githooks/.shared &&
     cd /tmp/test061 &&
-    git init ||
+    git init &&
+    echo '/tmp/shared/second-shared.git' >/tmp/test061/.githooks/.shared ||
     exit 1
 
 if git hooks list | grep -q "sample-one"; then