From a471c7716e57605ca19ff219592d58853b849f3f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 6 Sep 2019 10:51:14 -0700 Subject: [PATCH] scoutfs-tests: verify branch name with origin We check out the specified git branch with "origin/" prepended, but we weren't verifying that same full branch so the verification failed because it couldn't distinguish differentiate amongst possible named branches. Signed-off-by: Zach Brown --- tests/run-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 5be70bae..5f132e7a 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -222,7 +222,7 @@ if [ -n "$T_KMOD_REPO" ]; then cmd cd "$T_KMOD_REPO" cmd git fetch - cmd git rev-parse --verify "$T_KMOD_BRANCH" + cmd git rev-parse --verify "origin/$T_KMOD_BRANCH" cmd git checkout -B "$T_KMOD_BRANCH" --track origin/$T_KMOD_BRANCH cmd git pull --rebase cmd make @@ -238,7 +238,7 @@ if [ -n "$T_UTILS_REPO" ]; then cmd cd "$T_UTILS_REPO" cmd git fetch - cmd git rev-parse --verify "$T_UTILS_BRANCH" + cmd git rev-parse --verify "origin/$T_UTILS_BRANCH" cmd git checkout -B "$T_UTILS_BRANCH" --track origin/$T_UTILS_BRANCH cmd git pull --rebase # might need git clean to remove stale src/*.o after update