diff options
| author | Ori Bernstein <ori@eigenstate.org> | 2022-02-10 01:33:36 +0000 |
|---|---|---|
| committer | Ori Bernstein <ori@eigenstate.org> | 2022-02-10 01:33:36 +0000 |
| commit | 2367a2aeaec8432e6b059135e49c2fa86e415ae5 (patch) | |
| tree | 5ed768861710a9addd09685f751d7bc63935debb /sys | |
| parent | beeb05420952a3ca106bcc3395ecb9c974b4f464 (diff) | |
git/branch: fix order of operations (thanks qwx)
Diffstat (limited to 'sys')
| -rwxr-xr-x | sys/src/cmd/git/branch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/src/cmd/git/branch b/sys/src/cmd/git/branch index 4646c3270..a36dc12e1 100755 --- a/sys/src/cmd/git/branch +++ b/sys/src/cmd/git/branch @@ -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' } |