cirno/plan9front
1
0
Fork 0
mirror of git://git.9front.org/plan9front/plan9front synced 2025-01-12 11:10:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

git/branch: avoid null list errors

Browse source
This commit is contained in:
Ori Bernstein 2023-10-29 19:56:13 +00:00
parent c9309329eb
commit 466cf20d35
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

@ -52,7 +52,7 @@ deleted=`$nl{git/query -c HEAD $base | grep '^-' | subst '^..'}
if(~ $delete 1 && ~ `{git/query HEAD} `{git/query $branch})
die 'cannot delete current branch'
# if we're not merging, don't clobber existing changes.
if(~ $#merge 0 && ! $delete){
if(~ $#merge 0 && ~ $#delete 0){
if(! ~ $#modified 0 || ! ~ $#deleted 0){
git/walk -fRMA $modified $deleted ||
die 'uncommitted changes would be clobbered'