From fba5af71bea9ed4e0a8d378eeb0221fbf2d8a5e3 Mon Sep 17 00:00:00 2001 From: Adrian Dimitrov Date: Wed, 15 Jun 2022 20:43:45 +0300 Subject: [PATCH] Use core attributesFile from worktree When using attribute file overrides (for example if override in .dotfiles or by other includes), get the core.attributesFile from the current worktree if available. --- transcrypt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transcrypt b/transcrypt index 9340997..981be9c 100755 --- a/transcrypt +++ b/transcrypt @@ -82,7 +82,7 @@ gather_repo_metadata() { # the current git repository's gitattributes file local CORE_ATTRIBUTES - CORE_ATTRIBUTES=$(git config --get --local --path core.attributesFile 2>/dev/null || printf '') + CORE_ATTRIBUTES=$(git config --get --local --path core.attributesFile 2>/dev/null || git config --get --path core.attributesFile 2>/dev/null || printf '') if [[ $CORE_ATTRIBUTES ]]; then readonly GIT_ATTRIBUTES=$CORE_ATTRIBUTES elif [[ $IS_BARE == 'true' ]] || [[ $IS_VCSH == 'true' ]]; then