ref: 24c6bf14ccc9292cd735b7427422a2e6b309c07b
parent: 91884b5863294fafccdc737182ef5a24fb258e70
author: Ori Bernstein <[email protected]>
date: Tue Mar 24 00:32:41 EDT 2020
make the check right for nothing to commit test -f clobbered the status, so we were doing the wrong thing. oops.
--- a/commit
+++ b/commit
@@ -107,7 +107,7 @@
if(~ $#* 0)
usage
files=`{git/walk -c `{cleanname $gitrel/$*}}-if(~ $status '' || ~ $#files 0)
+if(~ $status '' || ~ $#files 0 && ! test -f .git/index9/merge-parents)
die 'nothing to commit' $status
@{flag e +