diff options
| author | Ori Bernstein <ori@eigenstate.org> | 2023-10-29 19:56:13 +0000 |
|---|---|---|
| committer | Ori Bernstein <ori@eigenstate.org> | 2023-10-29 19:56:13 +0000 |
| commit | 466cf20d3524b8e42edc333a6d2df2a01e99a95b (patch) | |
| tree | 03885478f2c5f6f00731ca44082eb458c211e6ed | |
| parent | c9309329eb31b7d739cf2590592e441cc08f4c5f (diff) | |
git/branch: avoid null list errors
| -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 6bcb23820..f7810d5aa 100755 --- a/sys/src/cmd/git/branch +++ b/sys/src/cmd/git/branch @@ -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' |