psi-jack/yadm
1
0
Fork 0
mirror of synced 2025-01-15 00:56:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #162 from DWagenk/feat_dwagenk_use_GIT_PROGRAMM_env_var

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
yadm
View file

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