From nobody Sat Nov 23 21:10:26 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1730317522; cv=none; d=zohomail.com; s=zohoarc; b=Xb9vcz9yagdFyXmszhDSsNbWsNWhhYcO0IrVQ84dhBfo3EMOoBHpX1htkwo6vCzMDikiWPBqmKKZO4uZJAQ+glm9wdP3KqGMZsGxxsfEp8RiP24I4N7FdIsnxz4O7QbL1KjSG7+PCEi7Lm8QcnOyGJxHYzCXLuRB3hPtAEWCUwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730317522; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=9qA4Y0k56pJdKOhEG8laINea+E3H+cDEFib+L14O9Kc=; b=XqwlADiBuQArQ/wJ2SQZZzUHOUTW8au3RI8LnJlEIRHPgASvEOGrEC18p7EpMXXl2/gJe/93LtHWXAV5kWVT1e0uxp+VkKgZPvoMWR7GF2l/OAKsNq3dxsxEKahJE7LQAixT0uCRGrciKnZeSx4UUR+vkDPIoC90gL+RrDqaOd4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1730317522120443.75670308909616; Wed, 30 Oct 2024 12:45:22 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.828409.1243268 (Exim 4.92) (envelope-from ) id 1t6Ecc-0005Sq-Cv; Wed, 30 Oct 2024 19:44:50 +0000 Received: by outflank-mailman (output) from mailman id 828409.1243268; Wed, 30 Oct 2024 19:44:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t6Ecc-0005Sj-AP; Wed, 30 Oct 2024 19:44:50 +0000 Received: by outflank-mailman (input) for mailman id 828409; Wed, 30 Oct 2024 19:44:49 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t6Ecb-0005Rr-4F for xen-devel@lists.xenproject.org; Wed, 30 Oct 2024 19:44:49 +0000 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [2a00:1450:4864:20::130]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6858263a-96f7-11ef-99a3-01e77a169b0f; Wed, 30 Oct 2024 20:44:42 +0100 (CET) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-539f2b95775so227507e87.1 for ; Wed, 30 Oct 2024 12:44:42 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a9b3a088adesm594815866b.222.2024.10.30.12.44.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2024 12:44:40 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6858263a-96f7-11ef-99a3-01e77a169b0f X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjoxMzAiLCJoZWxvIjoibWFpbC1sZjEteDEzMC5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6IjY4NTgyNjNhLTk2ZjctMTFlZi05OWEzLTAxZTc3YTE2OWIwZiIsInRzIjoxNzMwMzE3NDgyLjQ4NTkzNywic2VuZGVyIjoiYW5kcmV3LmNvb3BlckBjbG91ZC5jb20iLCJyZWNpcGllbnQiOiJ4ZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcifQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1730317481; x=1730922281; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9qA4Y0k56pJdKOhEG8laINea+E3H+cDEFib+L14O9Kc=; b=lPMgUJ4+Bz3ruaYmiXBmMMphkcWp7yzKh0e/8qI4j9T2Y0Cm5JV/791mXENeaTDR27 nfZEAVssCFs/ITL7na0phJHn2NS+nrs+Mq2QeeLU99a5h4WvwFwRuEkHdyJY7scVC8MG aY9VQTKxCXpcd+oShw7ieiYoVSior2RkRyKsc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730317481; x=1730922281; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9qA4Y0k56pJdKOhEG8laINea+E3H+cDEFib+L14O9Kc=; b=UU9iPZJXOQkK186m9CpyDLrSQRRbt9ayEZrCJBuEV8MQcEYlsyrddnZ+scPx+fcFc6 G4OzjP8EXiZgF4NvGzgwLayAqHgDq/i4NhzeXKynRZbHHNSix7ZjpQ+SxfGycE10gTg5 pTJz+s6a6uMtQltX+Hty7iA0Yb4gpk6uI1GqNAoVAHFbZjNWsgxxzBVhBdMOde/YsYox Ird63JgmaZNOQsWuKQOSYTGI2vXsiMx3JbAhiFXaWuUpOxvmmmiM/f6iVvD5NMzKi/OU i+2o+l+yt5x93vIZVY7FrnqrWa1PFIRgbJ3lSYwdJV67daDIvqolnMrWYhMbfsTRilz5 F9zw== X-Gm-Message-State: AOJu0Yw9gYMEs1lfydar9N899ANywlFkLXjl9y2Gfvnb679SdsjNXkcM FLQeVyfRr/mdslwP3xRoR2Sht/E1ye2NpJs6lmgszDAlQSZeaKkhGmV83rfuAbq5GyBbw9aZanG X X-Google-Smtp-Source: AGHT+IEd7p/h1h626YohcpNZc0DXBOWph7qKoLa6zj59b8SJ4DbHAbUzU6q6SII+9k8KH+0hnpwVdQ== X-Received: by 2002:a05:6512:1282:b0:53b:1fd1:df34 with SMTP id 2adb3069b0e04-53b3491e0eamr14605494e87.45.1730317481252; Wed, 30 Oct 2024 12:44:41 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , Jan Beulich , Stefano Stabellini , Julien Grall Subject: [PATCH] scripts: Fix git-checkout.sh to work with branches other than master Date: Wed, 30 Oct 2024 19:44:38 +0000 Message-Id: <20241030194438.2733973-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1730317522833116600 Content-Type: text/plain; charset="utf-8" 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 divergi= ng branches. Fix this by stating which branch/tag is wanted. $TAG is really a committish, and git-clone's -b/--branch takes a committish too. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- CC: Anthony PERARD CC: Juergen Gross CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall Found while trying to test the MiniOS fixes in Gitlab. This is a example r= un with most stubdom builds passing: https://gitlab.com/xen-project/people/andyhhp/xen/-/pipelines/1520611847 and all of them successfully cloned. --- scripts/git-checkout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/git-checkout.sh b/scripts/git-checkout.sh index fd4425ac4ee8..3796cbfe39a7 100755 --- a/scripts/git-checkout.sh +++ b/scripts/git-checkout.sh @@ -14,7 +14,7 @@ set -e 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 + $GIT clone -b $TAG $TREE $DIR-remote.tmp if test "$TAG" ; then cd $DIR-remote.tmp $GIT branch -D dummy >/dev/null 2>&1 ||: base-commit: bb7296d77f171c7bfbafab30ed51e9be29660e39 --=20 2.39.5