ref: e21d1a12b46c71f5bf6c12a789f846ea0277376e
parent: bddbc28d0b4f0610b5ba48d2d8b05147a3b13b9b
author: Ori Bernstein <ori@eigenstate.org>
date: Thu Jan 14 20:40:11 EST 2021
git/branch: prevent suppression of error message (thanks mcf)
--- a/branch
+++ b/branch
@@ -40,10 +40,8 @@
deleted=`$nl{git/query -c HEAD $base | grep '^-' | subst '^..'}
if(! ~ $#modified 0 || ! ~ $#deleted 0){
- if(! git/walk -q $modified $deleted){
- git/walk -fRMA $modified $deleted
+ git/walk -fRMA $modified $deleted || \
die 'uncommited changes would be clobbered'
- }
}
if(~ $delete 1){
rm -f .git/$new