From 01fb23dd71006d87e874f310e9c50f31582f274e Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Thu, 31 Oct 2024 13:35:40 +0000 Subject: [PATCH] scripts: Fix git-checkout.sh to work with non-master branches (take 2) First, rename $TAG to $COMMITTISH. We already pass tags, branches (well, only master) and full SHAs into this script. Xen uses master for QEMU_UPSTREAM_REVISION, and has done for other trees too in the path. Apparently we've never specified a different branch, because the git-clone rune only pulls in the master branch; it does not pull in diverging branches. Fix this by performing an explicit fetch of the $COMMITTISH, then checking out the dummy branch from the FETCH_HEAD. Suggested-by: Jason Andryuk Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini Reviewed-by: Jason Andryuk --- scripts/git-checkout.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/git-checkout.sh b/scripts/git-checkout.sh index fd4425ac4e..56a60193a7 100755 --- a/scripts/git-checkout.sh +++ b/scripts/git-checkout.sh @@ -1,12 +1,12 @@ #!/bin/sh if test $# -lt 3; then - echo "Usage: $0 " + echo "Usage: $0 " exit 1 fi TREE=$1 -TAG=$2 +COMMITTISH=$2 DIR=$3 set -e @@ -15,10 +15,11 @@ if test \! -d $DIR-remote; then rm -rf $DIR-remote $DIR-remote.tmp mkdir -p $DIR-remote.tmp; rmdir $DIR-remote.tmp $GIT clone $TREE $DIR-remote.tmp - if test "$TAG" ; then + if test "$COMMITTISH" ; then cd $DIR-remote.tmp + $GIT fetch origin "$COMMITTISH" $GIT branch -D dummy >/dev/null 2>&1 ||: - $GIT checkout -b dummy $TAG + $GIT checkout -b dummy FETCH_HEAD cd - fi mv $DIR-remote.tmp $DIR-remote -- 2.39.5