From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web10.1174.1591751174647123021 for ; Tue, 09 Jun 2020 18:06:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=Svhiy0y5; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: 4Zj++nc/cl7u2xfLLdNJYNhyl9vn7giN0RuuuIGH1KSikqj2QhE6ytHtj1KFsr/jwSsJNVLXW3 cbcKEC39NLLg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2020 18:06:12 -0700 IronPort-SDR: Ha6V/HtxL2Gwrff9x4kUTk4ZVi3qocjqs2BD9HY0lVdOCwautF5IAo1IB/5uPy480+X2hoCndo b5n3kjUt3GxQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,494,1583222400"; d="scan'208";a="296023678" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga004.fm.intel.com with ESMTP; 09 Jun 2020 18:06:12 -0700 Received: from fmsmsx104.amr.corp.intel.com (10.18.124.211) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 9 Jun 2020 18:06:12 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 9 Jun 2020 18:06:11 -0700 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.50) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 9 Jun 2020 18:06:09 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Li07yoLSgBxVTi85bL5JNuVMv/bPBAMPTGgBiNtWD6xekZ5R5rE0hrugoQE+eqowYCOhNwEHA25qVVzmJTmn+fWSL+QzN//x1n5gfpz4Du54O/biR0Rz24r9r3BtG7tiMnql7UX/sMjJ6omB76U7qo1aGCfS5nJsUWpraBD0o2Kl5MAY8lGuBX2OHOSfTKQrCpu2/XovoX7zrs16h7AUQn7TBjbhew4lv6GPz6B/MPkEqtQ/mVMvyzsghUiy+Hvo8lOvVkxUv9snBbttAsCDeVJ75J/HgTRkN8bn7TSWEKi3e/M561evTfKdMUnCrL4APmpNpB2payKqPHfMqO6AHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dD1woj1/sU7AnPmkSxoATQXqdBadxSkjQIbKSPt60Z0=; b=S8tVFDm/LPM1bMeLcLaom2ASDzz8Qpxqftd8vl+3i6Q9/9JKIDRj5SOOErY3TOm/fI3ylSWNCNFQbcVJ/x7xaAqSlCNznB8Tw0kCiuMPc3f58CmbTxtGcZC/AWUZ9XDC900S+POJGeyTFTo9tT2xx5O/0acItthSDVr1ic726QY0I/eRoqNQelaapr1YCIubMT+nkLAEwwG1C/aB5xc+juDgH1DOIt2/bEvwSRQPli50GEHw861xAt2up1ID2jBC90VG1GeZxOAEWl97v7S5x5wHIwRg2MlnBykGL/rzAPS+aPfRLzYuT906LziaAENOLG3pdlv9nj+mUtCXt5PJJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dD1woj1/sU7AnPmkSxoATQXqdBadxSkjQIbKSPt60Z0=; b=Svhiy0y5Sy8qXGSRj3E3FJZj8DNU5XTV9UoCL2mViRuuTWVPIfVGLBruLM4XHkqJut1qKnjbvCTGI2or2JRQkO8yDvVFDgu4iz2NcJpwmM+e81XBWmxprx8I3g57ydRqGecgGL7MzOSmrwAK6H+53yO4PExl7HU15r4P/LM5KFk= Received: from DM6PR11MB3978.namprd11.prod.outlook.com (2603:10b6:5:19a::14) by DM6PR11MB3145.namprd11.prod.outlook.com (2603:10b6:5:6e::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.22; Wed, 10 Jun 2020 01:06:07 +0000 Received: from DM6PR11MB3978.namprd11.prod.outlook.com ([fe80::a48d:1e32:5c9e:5f29]) by DM6PR11MB3978.namprd11.prod.outlook.com ([fe80::a48d:1e32:5c9e:5f29%6]) with mapi id 15.20.3066.023; Wed, 10 Jun 2020 01:06:07 +0000 From: "Ashley E Desimone" To: "Bjorge, Erik C" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Pandya, Puja" , Bret Barkelew , "Agyeman, Prince" Subject: Re: [edk2-staging/EdkRepo] [PATCH v1 1/2] EdkRepo: Add force flag when removing submodules Thread-Topic: [edk2-staging/EdkRepo] [PATCH v1 1/2] EdkRepo: Add force flag when removing submodules Thread-Index: AQHWPrJYgDPvTGv3AEunuTITHC6hXKjRCTpQ Date: Wed, 10 Jun 2020 01:06:07 +0000 Message-ID: References: <2fc6277c477b2ce69f4d130dbdc68dc3f514ee94.1591743203.git.erik.c.bjorge@intel.com> In-Reply-To: <2fc6277c477b2ce69f4d130dbdc68dc3f514ee94.1591743203.git.erik.c.bjorge@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.2.0.6 dlp-reaction: no-action dlp-product: dlpe-windows authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.55.52.220] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b14f63f8-ac89-4d99-5ba6-08d80cda74ea x-ms-traffictypediagnostic: DM6PR11MB3145: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4125; x-forefront-prvs: 0430FA5CB7 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: A41awOwMiLrHD4oq1cEWjHgs81SOKKAEn3xZq1uZqAMsGqqX/p1kIgTfjRtL8lpNeyyw+nkQ3JU1ceG3ev+Ka8uTKQEqfpxHCIbhfyrw8zyHI4ngszB1Jg/kaw7sOqKy7uSUFtNmOtfM7ym+MqqU5yoOP2zfec3hVUtErXS02qPeSkhuCng1O7fl0PTud3vXXLaMijKbyeK2+TQClAxZ3spgidjLnasDZaftEfR3LReRYWWnkig9iDeU0JuQroONIHYe6gtLGd0aPUyRKFy0k3F+J1c3OTPXU3bl7tw2eqIsk5vgEIDbMg14Z6wLjUNWn3KrRDtYl2WIDlwi19Hgbg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB3978.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(39860400002)(376002)(366004)(346002)(396003)(136003)(8676002)(4326008)(64756008)(33656002)(66476007)(66556008)(76116006)(107886003)(8936002)(66446008)(9686003)(6506007)(55016002)(26005)(66946007)(5660300002)(478600001)(2906002)(54906003)(53546011)(110136005)(186003)(71200400001)(7696005)(316002)(86362001)(52536014)(83380400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: 4zypG2mkqm8K2RAK1ALYufyMDDNznybeMMR1UWkn9dM57met506l6mC/Ev0jfS65VFFdiSsknUS/9y/GdJUnr6WDjagdVwTdJSDNVVamSq4jDsolKpD4zFVwmjHqNb9PLxxH0agSLhQ+zukig6nsP/eqHO5NqB9mIZvgaWNczxXE0AK4fAMMg6k6GsInX2jO63yfWdQ02caS+rnNeBY1r8CWu256lVXn+L5OAA/TpG0YpQqSib5fZFk+JGFWNGrjkAb68oc1AFhoYPIchmbRTqLOTrWyUXKOWG8D6o7CD7aZkG+3XdPazAa73RDNJAlrZwDA2pCl8I7x6G7dANR1deeuVNG/fWqbV7Iw/cJOqjKp7Avh33cVRnechsDqFJN+Z+lCHMQjTF2MPyVXO1+zQaaEH96IONcpasJ6ixDgY4Q6qLSDvFaT5btGQXdaMi87rJsUDXzUmPjJ4VqJ/OY8O3pI6nIoKQj0qaiQAvztK4J7t2TD+d/pMZsU1iCQ1qdu MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: b14f63f8-ac89-4d99-5ba6-08d80cda74ea X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Jun 2020 01:06:07.5685 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: hq2mfBpT1iZtX83HC/8CHEMWisb5JNA3eLAEomNzYHfE4pDjpBd6M7l0Ny/fjg2mOYc2r/354l2+QEPnx6LORRXjTSGpAwkdOyo80wd3e/s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3145 Return-Path: ashley.e.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ashley DeSimone -----Original Message----- From: Bjorge, Erik C =20 Sent: Tuesday, June 9, 2020 4:04 PM To: devel@edk2.groups.io Cc: Desimone, Ashley E ; Desimone, Nathaniel L= ; Pandya, Puja ; Br= et Barkelew ; Agyeman, Prince Subject: [edk2-staging/EdkRepo] [PATCH v1 1/2] EdkRepo: Add force flag when= removing submodules Submodules may generate un-tracked or modify files in the repo. when remov= ing 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 """ if submodules is None: - output_data =3D repo.git.execute(['git', 'submodule', 'deinit', '-= -all'], + output_data =3D repo.git.execute(['git', 'submodule', 'deinit',=20 + '-f', '--all'], with_extended_output=3DTrue, with_s= tdout=3DTrue) display_git_output(output_data, verbose) else: for sub in submodules: if verbose: print(strings.SUBMOD_DEINIT_PATH.format(sub.path)) - output_data =3D repo.git.execute(['git', 'submodule', 'deinit'= , '--', sub.path], + output_data =3D repo.git.execute(['git', 'submodule',=20 + 'deinit', '-f', '--', sub.path], with_extended_output=3DTrue, wi= th_stdout=3DTrue) display_git_output(output_data, verbose) return -- 2.27.0.windows.1