mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-05 06:50:29 +03:00
Merge branch 'deinit' into 'master'
add --force to git deinit See merge request fdroid/fdroidserver!1411
This commit is contained in:
commit
304caa4b42
1 changed files with 1 additions and 1 deletions
|
|
@ -1344,7 +1344,7 @@ class vcs_git(vcs):
|
||||||
|
|
||||||
def deinitsubmodules(self):
|
def deinitsubmodules(self):
|
||||||
self.checkrepo()
|
self.checkrepo()
|
||||||
p = FDroidPopen(['git', 'submodule', 'deinit', '--all'], cwd=self.local, output=False)
|
p = FDroidPopen(['git', 'submodule', 'deinit', '--all', '--force'], cwd=self.local, output=False)
|
||||||
if p.returncode != 0:
|
if p.returncode != 0:
|
||||||
raise VCSException(_("Git submodule deinit failed"), p.output)
|
raise VCSException(_("Git submodule deinit failed"), p.output)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue