RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2024-12-15 03:15:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

reclone: also fetch upstream, this then even can recover from upstream changes

Browse Source
This commit is contained in:
Rudolf Polzer 2010-09-18 13:13:43 +02:00
parent 20c8db330f
commit ff0fe7591e
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
all
View File

@ -895,15 +895,17 @@ case "$cmd" in
clean)
force=false
gotoupstream=false
fetchupstream=false
gotomaster=false
rmuntracked=false
killbranches=false
# usage:
# ./all clean [-m] [-f | -fu] [-r] [-D]
# ./all clean [-m] [-f | -fu | -fU] [-r] [-D]
# ./all clean --reclone
while :; do
if [ x"$1" = x"--reclone" ]; then
force=true
fetchupstream=true
gotoupstream=true
gotomaster=true
rmuntracked=true
@ -912,9 +914,16 @@ case "$cmd" in
force=true
elif [ x"$1" = x"-u" ]; then
gotoupstream=true
elif [ x"$1" = x"-U" ]; then
gotoupstream=true
fetchupstream=true
elif [ x"$1" = x"-fu" ]; then
force=true
gotoupstream=true
elif [ x"$1" = x"-Fu" ]; then
force=true
gotoupstream=true
fetchupstream=true
elif [ x"$1" = x"-m" ]; then
gotomaster=true
elif [ x"$1" = x"-r" ]; then
@ -934,6 +943,9 @@ case "$cmd" in
exit 1
fi
if $gotomaster; then
if $fetchupstream; then
verbose git fetch origin
fi
verbose git checkout -f "`repobranch "$d"`"
verbose git reset --hard origin/"`repobranch "$d"`"
else
@ -942,6 +954,9 @@ case "$cmd" in
rem=`git config "branch.$r.remote" || echo origin`
bra=`git config "branch.$r.merge" || echo "$r"`
upstream="$rem/${bra#refs/heads/}"
if $fetchupstream; then
verbose git fetch "$rem"
fi
if ! git rev-parse "$upstream" >/dev/null 2>&1; then
upstream="origin/`repobranch "$d"`"
fi