ref: 90192390f4a0a6d94468a7c3e988987ae29facb4
parent: 11b7f73625fa5c32842bd5efdde296587c40769b
author: Ori Bernstein <[email protected]>
date: Tue Mar 24 00:18:49 EDT 2020
only remove merge parents if we successfully commit.
--- a/commit
+++ b/commit
@@ -74,6 +74,7 @@
if(! ~ $#parents 0)
pflags='-p'^$parents
hash=`{git/save -n $"name -e $"email -m $"msg $pflags $files || die $status}+ rm -f .git/index9/merge-parents
}
fn update{@@ -97,7 +98,6 @@
fn sigexit{rm -f $msgfile $msgfile.tmp
- rm -f .git/index9/merge-parents
}
gitup