|
|
|
@ -410,13 +410,13 @@ EOF
|
|
|
|
|
|
|
|
|
|
# operate on the yadm repo's configuration file
|
|
|
|
|
# this is always local to the machine
|
|
|
|
|
$GIT_PROGRAM config --local "$@"
|
|
|
|
|
"$GIT_PROGRAM" config --local "$@"
|
|
|
|
|
|
|
|
|
|
CHANGES_POSSIBLE=1
|
|
|
|
|
|
|
|
|
|
else
|
|
|
|
|
# operate on the yadm configuration file
|
|
|
|
|
$GIT_PROGRAM 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_PROGRAM --version 2>/dev/null)
|
|
|
|
|
git_version="$("$GIT_PROGRAM" --version 2>/dev/null)"
|
|
|
|
|
if [[ "$git_version" =~ windows ]] ; then
|
|
|
|
|
USE_CYGPATH=1
|
|
|
|
|
fi
|
|
|
|
|