diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-25 18:00:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-25 18:00:28 +0000 |
| commit | e9bbe18583701a3e54ef229b36b8ad729008ae66 (patch) | |
| tree | 5f253cac97f11945c77a6267a447c8b9ed184704 | |
| parent | ce617afaf0c3e5bd455f33cfade26072d1c56ab8 (diff) | |
| parent | 156e8d63c62f5f0c0c93f0f6ccd1818aa4dd6332 (diff) | |
Merge "salt.sh: Rework `git -C` for older git compat" into stable/euphrates
| -rwxr-xr-x | mcp/scripts/salt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index 631cc4ad9..ab096f3ee 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -12,7 +12,7 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x F_GIT_ROOT=$(git rev-parse --show-toplevel) -F_GIT_DIR=$(git -C "${F_GIT_ROOT}/mcp" rev-parse --git-dir) +F_GIT_DIR=$(cd "${F_GIT_ROOT}/mcp" && git rev-parse --git-dir) F_GIT_SUBD=${F_GIT_ROOT#${F_GIT_DIR%%/.git*}} OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/opnfv" OPNFV_GIT_DIR="/root/opnfv" |