Merge branch 'fg/document-commit-message-stripping'

diff --git a/git-pull.sh b/git-pull.sh
index 4d4fc77b05648c7d2d76ae932b7d68cdf411d364..ad442264cbae0003dc548b85769cbeb2107c7d5f 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -240,7 +240,7 @@ test true = "$rebase" && {
        if ! git rev-parse -q --verify HEAD >/dev/null
        then
                # On an unborn branch
-               if test -f "$GIT_DIR/index"
+               if test -f "$(git rev-parse --git-path index)"
                then
                        die "$(gettext "updating an unborn branch with changes added to the index")"
                fi