From: "Ashley E Desimone" <ashley.e.desimone@intel.com>
To: "Bjorge, Erik C" <erik.c.bjorge@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: "Desimone, Nathaniel L" <nathaniel.l.desimone@intel.com>,
"Pandya, Puja" <puja.pandya@intel.com>,
Bret Barkelew <Bret.Barkelew@microsoft.com>,
"Agyeman, Prince" <prince.agyeman@intel.com>
Subject: Re: [edk2-staging/EdkRepo] [PATCH v2 1/3] EdkRepo: Add force flag when removing submodules
Date: Fri, 19 Jun 2020 18:17:40 +0000 [thread overview]
Message-ID: <BY5PR11MB3973A8004943558B7609E1ABB2980@BY5PR11MB3973.namprd11.prod.outlook.com> (raw)
In-Reply-To: <9eacb6be0293ca7629748a0b95e7dd9489fa1440.1591827056.git.erik.c.bjorge@intel.com>
Pushed as: be6fadb6b0398cbcdf8ddbd40f5c16b67d17e551
-----Original Message-----
From: Bjorge, Erik C <erik.c.bjorge@intel.com>
Sent: Wednesday, June 10, 2020 3:14 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone@intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>; Pandya, Puja <puja.pandya@intel.com>; Bret Barkelew <Bret.Barkelew@microsoft.com>; Agyeman, Prince <prince.agyeman@intel.com>
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 removing the submodule do so even with modifications.
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Puja Pandya <puja.pandya@intel.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Cc: Prince Agyeman <prince.agyeman@intel.com>
Cc: Erik Bjorge <erik.c.bjorge@intel.com>
Signed-off-by: Erik Bjorge <erik.c.bjorge@intel.com>
---
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=None, verbose=False):
verbose - Enable verbose messages """ if submodules is None:- output_data = repo.git.execute(['git', 'submodule', 'deinit', '--all'],+ output_data = repo.git.execute(['git', 'submodule', 'deinit', '-f', '--all'], with_extended_output=True, with_stdout=True) display_git_output(output_data, verbose) else: for sub in submodules: if verbose: print(strings.SUBMOD_DEINIT_PATH.format(sub.path))- output_data = repo.git.execute(['git', 'submodule', 'deinit', '--', sub.path],+ output_data = repo.git.execute(['git', 'submodule', 'deinit', '-f', '--', sub.path], with_extended_output=True, with_stdout=True) display_git_output(output_data, verbose) return--
2.27.0.windows.1
next prev parent reply other threads:[~2020-06-19 18:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-10 22:13 [edk2-staging/EdkRepo] [PATCH v2 0/3] Small fixes to submodule support Bjorge, Erik C
2020-06-10 22:13 ` [edk2-staging/EdkRepo] [PATCH v2 1/3] EdkRepo: Add force flag when removing submodules Bjorge, Erik C
2020-06-19 18:17 ` Ashley E Desimone [this message]
2020-06-10 22:13 ` [edk2-staging/EdkRepo] [PATCH v2 2/3] EdkRepo: Adding backwards compatibility for old pin files Bjorge, Erik C
2020-06-19 18:18 ` Ashley E Desimone
2020-06-10 22:13 ` [edk2-staging/EdkRepo] [PATCH v2 3/3] EdkRepo: Fix submodule failures when switching combos Bjorge, Erik C
2020-06-19 18:19 ` [edk2-devel] " Ashley E Desimone
2020-06-10 23:55 ` [edk2-staging/EdkRepo] [PATCH v2 0/3] Small fixes to submodule support Ashley E Desimone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BY5PR11MB3973A8004943558B7609E1ABB2980@BY5PR11MB3973.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox