shithub: riscv

Info  •  Files  •  Log  •  Branches

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

This fixes importing patches with multiline commit messages generated
by git-format-patch.  It also matches commit message sanitation done
by git-am.

--- a/sys/src/cmd/git/import

+++ b/sys/src/cmd/git/import

@@ -45,12 +45,19 @@

 	}

 	state=="headers" && /^$/ {

 		state="body"

-		next

 	}

 	(state=="headers" || state=="body") && (/^diff / || /^---( |$)/){

 		state="diff"

 	}

+	state=="body" && /^[ 	]*$/ {

+		empty=1

+		next

+	}

 	state=="body" {

+		if(empty)

+			printf "\n" > "/env/msg"

+		empty=0

+		sub(/[ 	]+$/, "")

 		print > "/env/msg"

 	}

 	state=="diff" {