xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Ori Bernstein 2022-02-10 01:33:36 +00:00
parent beeb054209
commit 2367a2aeae
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/git/branch
View file

@ -48,7 +48,7 @@ if(~ $#newbr 0){
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'
}