git: 9front

Info  •  Files  •  Log  •  Branches

git/branch: fix order of operations (thanks qwx)

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

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

@@ -48,7 +48,7 @@

 modified=`$nl{git/query -c HEAD $base | grep '^[^-]' | subst '^..'}

 deleted=`$nl{git/query -c HEAD $base | grep '^-' | subst '^..'}

-if(! ~ $#modified 0 || ! ~ $#deleted 0 && ~ $#merge 0){

+if(! ~ $#modified 0 || {! ~ $#deleted 0 && ~ $#merge 0}){

 	git/walk -fRMA $modified $deleted || 

 		die 'uncommited changes would be clobbered'

 }

-- 

⑨