git/pull: allow arbitrary upstreams with -u

This used to work, but probably got broken when moving to aux/getflags. Bring it back.
oridb · Nov 15, 2020 · c9a4dbe · c9a4dbe
1 parent 398a2a4
commit c9a4dbe
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/pull b/pull
@@ -41,8 +41,11 @@ if(~ $allbranch 1)
 	branch=''
 
 if(~ $#upstream 0)
-	upstream=origin
-remote=`{git/conf 'remote "'$upstream'".url'}
+	remote=`{git/conf 'remote "origin".url'}
+if not
+	remote=`{git/conf 'remote "'$upstream'".url'}
+if(~ $#remote 0)
+	remote=$upstream
 if(~ $#remote 0)
 	die 'no remote to pull from'