git: 9front

Info  •  Files  •  Log  •  Branches

git/branch: don't clobber baseref when checking if we have an upstream branch

if we assign baseref before checking if we already have the local branch, we end up
querying for the branch at the origin. this is not fine if we are trying to switch
to a local branch that is not present there.

--- a/sys/src/cmd/git/branch

+++ b/sys/src/cmd/git/branch

@@ -40,10 +40,11 @@

 if(~ $#newbr 0){

 	if(! ~ $#baseref 0)

 		die update would clobber $branch with $baseref

-	baseref=`$nl{echo -n $new | sed s@refs/heads/@refs/remotes/origin/@}

-	if(! test -e .git/$new)

+	if(! test -e .git/$new){

+		baseref=`$nl{echo -n $new | sed s@refs/heads/@refs/remotes/origin/@}

 		if(! base=`{git/query $baseref})

 			exit 'bad ref'

+	}

 }

 # figure out where we want the new branch to point to

-- 

⑨