shithub: git9

Info  •  Files  •  Log  •  Branches

Improve the git/import script: don't grab some spare junk.

--- a/import

+++ b/import

@@ -49,16 +49,12 @@

 		msg=msg $0 "\n"

 	}

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

-		state="prebody"

+		state="body"

 	}

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

+	(state=="headers" || state=="body") && (/^diff/ || /^---[ 	]*$/){

 		state="diff"

 		print > ENVIRON["diffpath"]

 	}

-	state=="prebody" && !/^(---[ 	]*)?$/{

-		print msg > "/env/msg"

-		state="body"

-	}

 	state=="body" {

 		print > "/env/msg"

 	}

@@ -68,8 +64,10 @@

 	END{

 		if(state != "diff")

 			exit("malformed patch: " state);

-		if(name == "" || email == "" || msg == "" || date=="")

-			print "missing headers"

+		if(name == "" || email == "" || msg == "" || date == ""){

+			print "missing headers" > "/fd/2";

+			exit("missingheader");

+		}

 		printf "%s", name > "/env/name"

 		printf "%s", email > "/env/email"

 		printf "%s", msg > "/env/msg"

@@ -76,6 +74,11 @@

 		printf "%s", date > "/env/date"

 	}

 	'

+	st=$status

+	if(! ~ $st ''){

+		echo could not import: $st >[1=2]

+		exit badpatch

+	}

 	# force re-reading env

 	rc -c '