From nobody Mon Apr 29 02:48:09 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562616246; cv=none; d=zoho.com; s=zohoarc; b=bhiFXrPLHeIVMO6A+FDCHZNNHEI7Lz44bef1414fjK+QdDXEvhIj4hzsRM0tqBjssLPTGGS4Ngae02eBOaRYQ4ikXDDg9Pu57Ktw7yCLddXTvhCku7KBJly2P//484d084VxAHlc4uDmlpAsIGPtyB+5Gf/9/YFpfX5xR78Rjos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562616246; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=Y3jF/VtNn6Pm5Mzv+I6UBzCZo3KEOHJGO7lyyFEIZgI=; b=PrdLHLv+SCJhLVGPJeNOivW+u64A4kh34MVAMRqjg7dpdcOog5ktcov7oRXFRLiCd5lQYwsOwGbSVU/8iCpgm36+ItG8GNH1mg6nxE9+HBwPvR0wtVBiQp/qEwrI/gfIEcKxabfDLwoxZktsrJBhDCLdC+3TO9oT2+ZrKOw2t3k= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562616246456778.107746037936; Mon, 8 Jul 2019 13:04:06 -0700 (PDT) Received: from localhost ([::1]:44440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkZrk-0007LI-7u for importer@patchew.org; Mon, 08 Jul 2019 16:04:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44709) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkZr0-0006o1-BG for qemu-devel@nongnu.org; Mon, 08 Jul 2019 16:03:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkZqz-0007J8-Du for qemu-devel@nongnu.org; Mon, 08 Jul 2019 16:03:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40468) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hkZqz-0007IC-8J for qemu-devel@nongnu.org; Mon, 08 Jul 2019 16:03:13 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BD4E53082E4B; Mon, 8 Jul 2019 20:03:01 +0000 (UTC) Received: from localhost (ovpn-112-17.ams2.redhat.com [10.36.112.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DF48608C6; Mon, 8 Jul 2019 20:02:53 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Tue, 9 Jul 2019 00:02:49 +0400 Message-Id: <20190708200250.12017-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 08 Jul 2019 20:03:01 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] archive-source: also create a stash for submodules X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , thuth@redhat.com, philmd@redhat.com, kraxel@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" "git archive" fails when a submodule has a modification, because "git stash create" doesn't handle submodules. Let's teach our archive-source.sh to handle modifications in submodules the same way as qemu tree, by creating a stash. Signed-off-by: Marc-Andr=C3=A9 Lureau Tested-by: Philippe Mathieu-Daud=C3=A9 --- scripts/archive-source.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index ca94e49978..fb5d6b3918 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -39,14 +39,16 @@ function cleanup() { } trap "cleanup" 0 1 2 3 15 =20 -if git diff-index --quiet HEAD -- &>/dev/null -then - HEAD=3DHEAD -else - HEAD=3D$(git stash create) -fi +function tree_ish() { + local retval=3D'HEAD' + if ! git diff-index --quiet --ignore-submodules=3Dall HEAD -- &>/dev/n= ull + then + retval=3D$(git stash create) + fi + echo "$retval" +} =20 -git archive --format tar $HEAD > "$tar_file" +git archive --format tar "$(tree_ish)" > "$tar_file" test $? -ne 0 && error "failed to archive qemu" for sm in $submodules; do status=3D"$(git submodule status "$sm")" @@ -62,7 +64,7 @@ for sm in $submodules; do echo "WARNING: submodule $sm is out of sync" ;; esac - (cd $sm; git archive --format tar --prefix "$sm/" $smhash) > "$sub_fil= e" + (cd $sm; git archive --format tar --prefix "$sm/" $(tree_ish)) > "$sub= _file" test $? -ne 0 && error "failed to archive submodule $sm ($smhash)" tar --concatenate --file "$tar_file" "$sub_file" test $? -ne 0 && error "failed append submodule $sm to $tar_file" --=20 2.22.0.214.g8dca754b1e