[edk2-devel] [edk2-staging/EdkRepo] [PATCH v2 1/3] EdkRepo: Add force flag when removing submodules
Ashley E Desimone
ashley.e.desimone at intel.com
Fri Jun 19 18:17:40 UTC 2020
Pushed as: be6fadb6b0398cbcdf8ddbd40f5c16b67d17e551
-----Original Message-----
From: Bjorge, Erik C <erik.c.bjorge at intel.com>
Sent: Wednesday, June 10, 2020 3:14 PM
To: devel at edk2.groups.io
Cc: Desimone, Ashley E <ashley.e.desimone at intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone at intel.com>; Pandya, Puja <puja.pandya at intel.com>; Bret Barkelew <Bret.Barkelew at microsoft.com>; Agyeman, Prince <prince.agyeman at 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 at intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone at intel.com>
Cc: Puja Pandya <puja.pandya at intel.com>
Cc: Bret Barkelew <Bret.Barkelew at microsoft.com>
Cc: Prince Agyeman <prince.agyeman at intel.com>
Cc: Erik Bjorge <erik.c.bjorge at intel.com>
Signed-off-by: Erik Bjorge <erik.c.bjorge at 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 (#61537): https://edk2.groups.io/g/devel/message/61537
Mute This Topic: https://groups.io/mt/74807384/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list