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/commit: preserve merge-parents on failed commit

Browse source
This commit is contained in:
Noam Preil 2024-09-22 20:24:16 +00:00
parent f3f659b54b
commit dcff4acbb6
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/commit
View file

@ -78,7 +78,6 @@ fn commit{
if(! ~ $#parents 0)
pflags='-p'^$parents
hash=`{git/save -n $"name -e $"email -m $"msg $pflags $files || die $status}
rm -f .git/merge-parents
}
fn update{
@ -86,6 +85,7 @@ fn update{
# Paranoia: let's not mangle the repo.
if(~ $#hash 0)
die 'botched commit'
rm -f .git/merge-parents
echo $branch: $hash
echo $hash > $refpath
for(f in $files){