utils-code/tj.git-extras
1
0
Fork 0
mirror of https://github.com/tj/git-extras.git synced 2026-09-15 01:46:25 -04:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

add --force option to continue on error

Browse source
This commit is contained in:
go2null 2019-10-20 14:03:58 -04:00 committed by Test Script
parent f00c1389d6
commit 17d1a471a4
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bin/git-delete-submodule
View file

@ -2,9 +2,13 @@
abort() {
error="$1" && shift
echo "FATAL: $*" 1>&2 && exit "$error"
echo "ERROR: $*" 1>&2
test -z "$FORCE" && exit "$error"
}
# Don't abort on failures. This allows to cleanup after a rpevious failure.
[ "$1" = '--force' ] && FORCE=1 && shift
test -z "$1" && abort 1 'Submodule required'
cd "$(git root)" || abort 5 'Cannot change to repository root'
test ! -f '.gitmodules' && abort 2 '.gitmodules file not found'
@ -30,7 +34,6 @@ git add '.gitmodules'
[ "$(wc -l '.gitmodules' | cut -d' ' -f1)" = '0' ] && git rm -f '.gitmodules'
# 3. Need to confirm and commit the changes for yourself
echo
if git submodule status >/dev/null 2>&1 \
&& ! git submodule status | grep "$NAME"; then
echo "Successfully deleted $NAME."
@ -39,6 +42,5 @@ else
fi
echo
git submodule status
echo
echo 'Confirm the output of `git submodule status` above' \
' and commit the changes for yourself.'