Reviewed-by: Ashley DeSimone <ashley.e.desim...@intel.com>
-----Original Message-----
From: Bjorge, Erik C <erik.c.bjo...@intel.com>
Sent: Tuesday, June 9, 2020 4:04 PM
To: devel@edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desim...@intel.com>; Desimone, Nathaniel L
<nathaniel.l.desim...@intel.com>; Pandya, Puja <puja.pan...@intel.com>; Bret
Barkelew <bret.barke...@microsoft.com>; Agyeman, Prince
<prince.agye...@intel.com>
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 removing
the submodule do so even with modifications.
Cc: Ashley E Desimone <ashley.e.desim...@intel.com>
Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
Cc: Puja Pandya <puja.pan...@intel.com>
Cc: Bret Barkelew <bret.barke...@microsoft.com>
Cc: Prince Agyeman <prince.agye...@intel.com>
Cc: Erik Bjorge <erik.c.bjo...@intel.com>
Signed-off-by: Erik Bjorge <erik.c.bjo...@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
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#61000): https://edk2.groups.io/g/devel/message/61000
Mute This Topic: https://groups.io/mt/74786169/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
