From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.769.1592590663316209041 for ; Fri, 19 Jun 2020 11:17:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=u9v/FG1A; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: ashley.e.desimone@intel.com) IronPort-SDR: T4MmndzeBOVwtuP80RENQqS/3M9+6XRKqBLdhq7NNR1kbBMa0jhH+63ykcctXSMOidH8KsL+kq 9EBq3BZGZytQ== X-IronPort-AV: E=McAfee;i="6000,8403,9657"; a="140566486" X-IronPort-AV: E=Sophos;i="5.75,256,1589266800"; d="scan'208";a="140566486" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jun 2020 11:17:42 -0700 IronPort-SDR: AL43Sd+7xyAkJkbgxEPoct57MARUr88ABLfkgEgMt5Cpkx1ejmirv5LL5RKy3kundaeqYZ8Rux /ZmXnwjcakKA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,256,1589266800"; d="scan'208";a="309501480" Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132]) by orsmga008.jf.intel.com with ESMTP; 19 Jun 2020 11:17:42 -0700 Received: from orsmsx122.amr.corp.intel.com (10.22.225.227) by ORSMSX105.amr.corp.intel.com (10.22.225.132) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 19 Jun 2020 11:17:41 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX122.amr.corp.intel.com (10.22.225.227) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 19 Jun 2020 11:17:41 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.108) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 19 Jun 2020 11:17:41 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FREhe/vhjNnqBH1jBqndhyG8jvZDMGzrLhC4AXV4LhZBAkwVBvtXIpG/XtxYzZKhvhZv2x3Uyg/cAqYW9A+eLG7qNA+ooeg/M9Z0aIaJxaGMbGjdfv9bnTwZVw/02WY4qqy4B1+2Kxd4kJGD4p1Qm8Y80tPo1zhLcmItKfU3JNWQfAlz/IpqwHAopU/Yw5XMlrPD/CDeOq2q7bOgJmhFUa/V9E+S/7r4yWYrtRMceLUcL2PzMY1C2oyc78R8EuxoVoLA27akkWXm2Uo82FRWqkNLhRTSTZlq4e9fjDJ4UwTzBvuNaeApKx7YRcTzY+TIc98MAYC3u/x+DFcuC0ZnWw== 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=dA/ElSLXkQbJ8rRh4utdz/SmlrVAfEW6gVZ9502qT8I=; b=JTWkxTWioUuD9rpJ+dH4rRDlXrYkSnWRMvTJuuuSghGr9iitjJXN7HPYNJv6/QvGREsX6kmKkicoHnpJWRbwCyct/bst6z3JGv79BQUW88ZUzQV2wJVcDPEAsbpnrIlTtaOnC5YMevNgLO+ulzwCw9bZGPGi871eduJyHK5kN+hKtzMJJTIVBZejA8dI+63wrG0XIBG+tx58AXVKnWDjEnmXt9oBhxq6b3SPE2AHHntOaMjRE6i1sQrZ02ckC+xkbT/jnkz2UfoBDSqzLnRBPGyiMivBDEp1KTKmmE7wU6iRzID1fg6SNYE1TVrXvdCLpVi27t9sC1PBZA2gCiuw5w== 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=dA/ElSLXkQbJ8rRh4utdz/SmlrVAfEW6gVZ9502qT8I=; b=u9v/FG1AqH8TjMA+IIb1E/zHKbs7gZxmjLThupVjT3wR/+x/GE7zGW6TnM2BIPFdAzfawb1FN1rIREBGaHTzuu9hHm0keOoKMfOqcZgdFvE82k0VEWKVZs2L+qrjjQi/d9DPKkc+SveJsDUeypEiXbkpQWCtihieSfSDt3bKGWo= Received: from BY5PR11MB3973.namprd11.prod.outlook.com (2603:10b6:a03:185::29) by BYAPR11MB2917.namprd11.prod.outlook.com (2603:10b6:a03:89::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.23; Fri, 19 Jun 2020 18:17:41 +0000 Received: from BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::19d5:343e:d3d:e733]) by BY5PR11MB3973.namprd11.prod.outlook.com ([fe80::19d5:343e:d3d:e733%7]) with mapi id 15.20.3109.021; Fri, 19 Jun 2020 18:17:41 +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 v2 1/3] EdkRepo: Add force flag when removing submodules Thread-Topic: [edk2-staging/EdkRepo] [PATCH v2 1/3] EdkRepo: Add force flag when removing submodules Thread-Index: AQHWP3SGvAvpkST31EanCGPCmvUunajgTJrw Date: Fri, 19 Jun 2020 18:17:40 +0000 Message-ID: References: <9eacb6be0293ca7629748a0b95e7dd9489fa1440.1591827056.git.erik.c.bjorge@intel.com> In-Reply-To: <9eacb6be0293ca7629748a0b95e7dd9489fa1440.1591827056.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.218] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: b7bd71c7-bca7-4295-9e78-08d8147d0dee x-ms-traffictypediagnostic: BYAPR11MB2917: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:4941; x-forefront-prvs: 0439571D1D x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 7invrmDHHX8pmwczFV5exGQJ8HV/1goprYCwgdry+NXzcAQOnS6glyl0cwNARLRvO5mX4oT0atVQEjKPJqz+eiOiEECEfkC1c1sfSe5CgvPHpZOxpy9mVIOEGEreN96sLxcOdP4WBnhly84jRubh3zGo231XZY035wWIOh9nGh6vDV6WZkUvOTUr3bU1gjgjiIIkBEEkWYzMvGykm8z79ats7FjfxYtl74MaN0qlgdfuoF2Ic+jl0+Hx0+/lwN5TyQWN3Qu5+OOv6W8eS8XYc7kn5WZ9Dlzh+VYt00qS9mVmwC1A+u2WY5PmAZ26WlKyBK2WwnnttvCZQqIvQrRUyg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR11MB3973.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(346002)(376002)(136003)(39860400002)(396003)(366004)(5660300002)(52536014)(6506007)(53546011)(83380400001)(478600001)(86362001)(107886003)(8936002)(4326008)(7696005)(26005)(71200400001)(186003)(110136005)(54906003)(316002)(2906002)(55016002)(9686003)(66476007)(64756008)(66446008)(76116006)(66556008)(66946007)(33656002)(8676002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: p9VSwFJL61B8idUGvZ9xaglqrC7+4rF3XxuNT/fXgi2AQpADNxboqyksFsUkVkrsQLpdulkfxLiWpQZwdy0HSutHVmKybG5Mu7fSY9sBv1Dc4e4PCUo+aMDsMeraf5KaLgj1/xi+1tBvWZZQHVWSdH7dPDpSXDxMqF5bM7I+YKN5+s61d2+BSyLfFfukW8erXzLfLwWORAJn3B3GO7B/KELJtLfNhqnFFnlSjYPILjwxJdod5WkgJHFKJb1Rsw8oujpvd7BP3Wdu5+WrW2MvjZSpr8DKSKsufdTCfvgHLlaSFS5Ymc7eZGIfEFlisTB2IWxRmbJGo9G/+pv2wQAmtLmRwhRC2GtTSl0kLgu4QGgftJvKvWAKme2UqGMMZnm/xrMDm9O12Usp/+QwqLMLpZd78+n8a+DtAZwr0I46Z4yaAZUg31NFdZMb4sJCvC218WsBo7yQKHcDn8T3Z6pFSygZp0dkGiAXzNnKZ96/0M5sYIpA9+mNzFzh93jDM9E4 MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: b7bd71c7-bca7-4295-9e78-08d8147d0dee X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jun 2020 18:17:40.8995 (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: Wo0POhP+IkDXn42/R4PVpC13gbbEE8evPUearmHfvxw4diRWmznkbLkoi3YB8g+W2tjCPXOFgMtLORtpf2QAHIJC4rAjXhE5HTPzckR5EAI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB2917 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 Pushed as: be6fadb6b0398cbcdf8ddbd40f5c16b67d17e551 -----Original Message----- From: Bjorge, Erik C =20 Sent: Wednesday, June 10, 2020 3:14 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 v2 1/3] 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', 'dei= nit', '-f', '--all'], with_extended_= output=3DTrue, with_stdout=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', '--', su= b.path],+ output_data =3D repo.git.execute(['git', 'submodule', = 'deinit', '-f', '--', sub.path], = with_extended_output=3DTrue, with_stdout=3DTrue) display_git_o= utput(output_data, verbose) return--=20 2.27.0.windows.1