git/pull: remove '-b' and '-a' option

we do the right thing by default now, let's not
add knobs that nobody cares about.
This commit is contained in:
Ori Bernstein 2022-04-28 03:35:54 +00:00
parent 3d047ddf03
commit a271f62bf2
2 changed files with 34 additions and 40 deletions

View file

@ -3,10 +3,9 @@ rfork en
. /sys/lib/git/common.rc
fn update{
branch=$1
upstream=$2
url=$3
dir=$4
upstream=$1
url=$2
dir=$3
dflag=()
if(! ~ $#debug 0)
dflag='-d'
@ -27,16 +26,11 @@ fn update{
gitup
flagfmt='a:allbranch, b:branch branch, d:debug,
f:fetchonly, u:upstream upstream, q:quiet'
flagfmt='d:debug, q:quiet, f:fetchonly,
u:upstream upstream'
args=''
eval `''{aux/getflags $*} || exec aux/usage
if(~ $#branch 0)
branch=refs/`{git/branch}
if(~ $allbranch 1)
branch=''
if(~ $#upstream 0)
upstream=origin
remote=`$nl{git/conf 'remote "'$upstream'".url'}
@ -45,7 +39,7 @@ if(~ $#remote 0){
upstream=THEM
}
update $branch $upstream $remote
update $upstream $remote
if (~ $fetchonly 1)
exit
@ -73,7 +67,6 @@ if(! ~ `{git/query HEAD $remote @} `{git/query HEAD}){
# no local commits that need merging.
if(~ $#quiet 0)
git/log -s -e $local'..'$remote
echo
echo $remote':' `{git/query $local} '=>' `{git/query $remote}
git/branch -mnb $remote $local
exit ''