psi-jack/yadm
1
0
Fork 0
mirror of synced 2024-12-22 06:31:07 -05:00
Code Issues Releases Wiki Activity

Deinit submodules before removing the repo

Browse source 
when forcing init/clone to happen.
This commit is contained in:
Erik Flodin 2021-01-03 23:02:25 +01:00
parent fb56513d17
commit accec694f5
No known key found for this signature in database
GPG key ID: 420A7C865EE3F85F
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/test_init.py
View file

@ -60,10 +60,11 @@ def test_init(
else: else:
assert run.success assert run.success
assert 'Initialized empty shared Git repository' in run.out assert 'Initialized empty shared Git repository' in run.out
assert run.err == ''
if repo_present: if repo_present:
assert not old_repo.isfile(), 'Original repo still exists' assert not old_repo.isfile(), 'Original repo still exists'
else:
assert run.err == ''
if alt_work: if alt_work:
assert repo_config('core.worktree') == paths.work assert repo_config('core.worktree') == paths.work

2
yadm
View file

@ -747,6 +747,7 @@ function clone() {
# remove existing if forcing the clone to happen anyway # remove existing if forcing the clone to happen anyway
[ -d "$YADM_REPO" ] && { [ -d "$YADM_REPO" ] && {
debug "Removing existing repo prior to clone" debug "Removing existing repo prior to clone"
"$GIT_PROGRAM" -C "$YADM_WORK" submodule deinit -f --all
rm -rf "$YADM_REPO" rm -rf "$YADM_REPO"
} }
@ -1129,6 +1130,7 @@ function init() {
# remove existing if forcing the init to happen anyway # remove existing if forcing the init to happen anyway
[ -d "$YADM_REPO" ] && { [ -d "$YADM_REPO" ] && {
debug "Removing existing repo prior to init" debug "Removing existing repo prior to init"
"$GIT_PROGRAM" -C "$YADM_WORK" submodule deinit -f --all
rm -rf "$YADM_REPO" rm -rf "$YADM_REPO"
} }