From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx.groups.io with SMTP id smtpd.web12.5859.1591827266064497558 for ; Wed, 10 Jun 2020 15:14:26 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: erik.c.bjorge@intel.com) IronPort-SDR: 0xeHWRr3IOrj/vf7EiYb8xJXDmK4jxLAT3pqI/419L5YkjoTfBimKArqpt381rtMnt4/atPunU aMynfOSOlXyg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2020 15:14:25 -0700 IronPort-SDR: lot32NEC+7o6utHw8vfVK6XNhfSl7XgdyimWs7g7XH2vyhBsWM7WKtJX3qPP3vmeXm637h8Ott dnPOxetSL89w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,497,1583222400"; d="scan'208";a="289345850" Received: from sfp-ecbjorge.amr.corp.intel.com ([10.165.41.176]) by orsmga002.jf.intel.com with ESMTP; 10 Jun 2020 15:14:25 -0700 From: "Bjorge, Erik C" To: devel@edk2.groups.io Cc: Ashley E Desimone , Nate DeSimone , Puja Pandya , Bret Barkelew , Prince Agyeman Subject: [edk2-staging/EdkRepo] [PATCH v2 1/3] EdkRepo: Add force flag when removing submodules Date: Wed, 10 Jun 2020 15:13:53 -0700 Message-Id: <9eacb6be0293ca7629748a0b95e7dd9489fa1440.1591827056.git.erik.c.bjorge@intel.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Submodules may generate un-tracked or modify files in the repo. when removing the submodule do so even with modifications. Cc: Ashley E Desimone Cc: Nate DeSimone Cc: Puja Pandya Cc: Bret Barkelew Cc: Prince Agyeman Cc: Erik Bjorge Signed-off-by: Erik Bjorge --- project_utils/submodule.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project_utils/submodule.py b/project_utils/submodule.py index 170629b..3d1b620 100644 --- a/project_utils/submodule.py +++ b/project_utils/submodule.py @@ -48,14 +48,14 @@ def _deinit(repo, submodules=3DNone, verbose=3DFalse): verbose - Enable verbose messages=0D """=0D if submodules is None:=0D - output_data =3D repo.git.execute(['git', 'submodule', 'deinit', '-= -all'],=0D + output_data =3D repo.git.execute(['git', 'submodule', 'deinit', '-= f', '--all'],=0D with_extended_output=3DTrue, with_s= tdout=3DTrue)=0D display_git_output(output_data, verbose)=0D else:=0D for sub in submodules:=0D if verbose:=0D print(strings.SUBMOD_DEINIT_PATH.format(sub.path))=0D - output_data =3D repo.git.execute(['git', 'submodule', 'deinit'= , '--', sub.path],=0D + output_data =3D repo.git.execute(['git', 'submodule', 'deinit'= , '-f', '--', sub.path],=0D with_extended_output=3DTrue, wi= th_stdout=3DTrue)=0D display_git_output(output_data, verbose)=0D return=0D --=20 2.27.0.windows.1