From: "Bjorge, Erik C" <erik.c.bjorge@intel.com>
To: devel@edk2.groups.io
Cc: Ashley E Desimone <ashley.e.desimone@intel.com>,
Nate DeSimone <nathaniel.l.desimone@intel.com>,
Puja Pandya <puja.pandya@intel.com>,
Bret Barkelew <Bret.Barkelew@microsoft.com>,
Prince Agyeman <prince.agyeman@intel.com>
Subject: [edk2-staging/EdkRepo] [PATCH v1 1/2] EdkRepo: Add force flag when removing submodules
Date: Tue, 9 Jun 2020 16:04:05 -0700 [thread overview]
Message-ID: <2fc6277c477b2ce69f4d130dbdc68dc3f514ee94.1591743203.git.erik.c.bjorge@intel.com> (raw)
In-Reply-To: <cover.1591743203.git.erik.c.bjorge@intel.com>
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-09 23:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 23:04 [edk2-staging/EdkRepo] [PATCH v1 0/2] Small fixes to submodule support Bjorge, Erik C
2020-06-09 23:04 ` Bjorge, Erik C [this message]
2020-06-10 1:06 ` [edk2-staging/EdkRepo] [PATCH v1 1/2] EdkRepo: Add force flag when removing submodules Ashley E Desimone
2020-06-09 23:04 ` [edk2-staging/EdkRepo] [PATCH v1 2/2] EdkRepo: Adding backwards compatibility for old pin files Bjorge, Erik C
2020-06-10 23:06 ` 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=2fc6277c477b2ce69f4d130dbdc68dc3f514ee94.1591743203.git.erik.c.bjorge@intel.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