mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-01-05 03:44:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs-tests: verify branch name with origin

Browse Source 
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 <zab@versity.com>
This commit is contained in:
Zach Brown
2019-09-06 10:51:14 -07:00
committed by Zach Brown
parent 2b966fd45c
commit a471c7716e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/run-tests.sh
View File

@@ -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