janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

make, scripts: git submodule update --init --recursive

Browse source 
Consistently run git submodule update with --init --recursive.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2018-11-18 18:31:30 +00:00
commit adb18caa13
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/rules.mk
View file

@ -132,7 +132,7 @@ love:
@echo "Not war?" @echo "Not war?"
cvsupdate update: cvsupdate update:
if [ -d "CVS" ]; then cvs update -dP || exit 1; else git pull || exit 1; fi if [ -d "CVS" ]; then cvs update -dP || exit 1; else git pull && git submodule update --init --recursive || exit 1; fi
cvsdiff diff: cvsdiff diff:
if [ -d "CVS" ]; then cvs diff -u || exit 1; else git --no-pager diff --relative --no-prefix . || exit 1; fi if [ -d "CVS" ]; then cvs diff -u || exit 1; else git --no-pager diff --relative --no-prefix . || exit 1; fi

6
scripts/pgit.sh
View file

@ -130,8 +130,7 @@ clone()
else else
run_git clone ssh://$login@git.janware.com/srv/git/$fromuser/proj/$p run_git clone ssh://$login@git.janware.com/srv/git/$fromuser/proj/$p
fi fi
run_git -C $p submodule init || fatal git submodule init failed in $p run_git -C $p submodule update --init --recursive || fatal git submodule update failed in $p
run_git -C $p submodule update || fatal git submodule update failed in $p
else else
local remotename="user-$fromuser" local remotename="user-$fromuser"
if [ -d $p ]; then if [ -d $p ]; then
@ -151,8 +150,7 @@ clone()
run_git -C $p branch --set-upstream-to origin/master master run_git -C $p branch --set-upstream-to origin/master master
# set +x # set +x
fi fi
run_git -C $p submodule init || fatal git submodule init failed in $p run_git -C $p submodule update --init --recursive || fatal git submodule update failed in $p
run_git -C $p submodule update || fatal git submodule update failed in $p
fi fi
done done
)} )}

1
scripts/pkg.sh
View file

@ -109,6 +109,7 @@ check_scm()
if [ -d .git ]; then if [ -d .git ]; then
log + checking git log + checking git
git pull --no-edit || fatal "git pull failed, giving up" git pull --no-edit || fatal "git pull failed, giving up"
git submodule update --init --recursive || fatal "git submodule update failed, giving up"
git status --porcelain | grep -v '^??' | grep -q . && { git status --porcelain | grep -v '^??' | grep -q . && {
git status git status
fatal "git has locally modified files, giving up" fatal "git has locally modified files, giving up"