summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-08-23 17:06:36 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-23 17:06:36 +0000
commit9719f8c6755cb87da0870f62007e220d1ad68b4a (patch)
tree08ccef17c99c3dcb7a6baeda08bc6ea82b6ff459
parent9e87b96399fa8440dfc751933874f373a763eade (diff)
parentd41e73b2bcdbb30cc967e2fe985a4aa85d351eda (diff)
Merge "Fix: git -C not available for git 1.8" into stable/colorado
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 519bce64..d5444cdb 100644
--- a/Makefile
+++ b/Makefile
@@ -79,14 +79,14 @@ patches-export: submodules-init
# For repos pinned in Fuel@OPNFV's config.mk, checkout pinned commit first
.PHONY: patches-import
patches-import: submodules-init
- @git -C ${FUEL_BASE} checkout -q master
- @git -C ${SUBMOD_DIR}/fuel-agent checkout -q ${FUEL_AGENT_COMMIT}
- @git -C ${SUBMOD_DIR}/fuel-astute checkout -q ${ASTUTE_COMMIT}
- @git -C ${SUBMOD_DIR}/fuel-library checkout -q ${FUELLIB_COMMIT}
- @git -C ${SUBMOD_DIR}/fuel-mirror checkout -q ${FUEL_MIRROR_COMMIT}
- @git -C ${SUBMOD_DIR}/fuel-nailgun-agent \
- checkout -q ${FUEL_NAILGUN_AGENT_COMMIT}
- @git -C ${SUBMOD_DIR}/fuel-web checkout -q ${NAILGUN_COMMIT}
+ @cd ${FUEL_BASE} && git checkout -q master
+ @cd ${SUBMOD_DIR}/fuel-agent && git checkout -q ${FUEL_AGENT_COMMIT}
+ @cd ${SUBMOD_DIR}/fuel-astute && git checkout -q ${ASTUTE_COMMIT}
+ @cd ${SUBMOD_DIR}/fuel-library && git checkout -q ${FUELLIB_COMMIT}
+ @cd ${SUBMOD_DIR}/fuel-mirror && git checkout -q ${FUEL_MIRROR_COMMIT}
+ @cd ${SUBMOD_DIR}/fuel-nailgun-agent && \
+ git checkout -q ${FUEL_NAILGUN_AGENT_COMMIT}
+ @cd ${SUBMOD_DIR}/fuel-web && git checkout -q ${NAILGUN_COMMIT}
@git submodule -q foreach ' \
mkdir -p ${PATCH_DIR}/$$name; \
git tag armband-workbench-root; \