xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

git/import: squash leading/trailing/consecutive blanks and strip trailing space

Browse source 
This fixes importing patches with multiline commit messages generated
by git-format-patch.  It also matches commit message sanitation done
by git-am.
This commit is contained in:
Michael Forney 2022-04-26 19:06:53 +00:00 committed by xfnw
parent fe1b02113e
commit d2942d4de3
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/src/cmd/git/import
View file

@ -45,12 +45,19 @@ fn apply @{
} }
state=="headers" && /^$/ { state=="headers" && /^$/ {
state="body" state="body"
next
} }
(state=="headers" || state=="body") && (/^diff / || /^---( |$)/){ (state=="headers" || state=="body") && (/^diff / || /^---( |$)/){
state="diff" state="diff"
} }
state=="body" && /^[ ]*$/ {
empty=1
next
}
state=="body" { state=="body" {
if(empty)
printf "\n" > "/env/msg"
empty=0
sub(/[ ]+$/, "")
print > "/env/msg" print > "/env/msg"
} }
state=="diff" { state=="diff" {