Merge pull request #162 from DWagenk/feat_dwagenk_use_GIT_PROGRAMM_env_var

This commit is contained in:
Tim Byrne 2019-07-29 08:04:29 -05:00
commit bd71ec8932
No known key found for this signature in database
GPG Key ID: 14DB4FC2465A4B12
1 changed files with 3 additions and 3 deletions

6
yadm
View File

@ -410,13 +410,13 @@ EOF
# operate on the yadm repo's configuration file
# this is always local to the machine
git config --local "$@"
"$GIT_PROGRAM" config --local "$@"
CHANGES_POSSIBLE=1
else
# operate on the yadm configuration file
git config --file="$(mixed_path "$YADM_CONFIG")" "$@"
"$GIT_PROGRAM" config --file="$(mixed_path "$YADM_CONFIG")" "$@"
fi
@ -844,7 +844,7 @@ function set_operating_system() {
case "$OPERATING_SYSTEM" in
CYGWIN*)
git_version=$(git --version 2>/dev/null)
git_version="$("$GIT_PROGRAM" --version 2>/dev/null)"
if [[ "$git_version" =~ windows ]] ; then
USE_CYGPATH=1
fi