shithub: git9

Info  •  Files  •  Log  •  Branches

Make git/import strip empty lines from start of commit message.

--- a/git.h

+++ b/git.h

@@ -179,7 +179,7 @@

 	} while(0)

 #define QDIR(qid)	((int)(qid)->path & (0xff))

-#define QPATH(id, dt)	(((uvlong)(id) << 8) | ((dt) & 0x7f))

+#define _QPATH(id, dt)	(((uvlong)(id) << 8) | ((dt) & 0x7f))

 #define isblank(c) \

 	(((c) != '\n') && isspace(c))

--- a/import

+++ b/import

@@ -30,9 +30,6 @@

 		exit 'invalid branch '$branch

 	awk '

 	BEGIN{

-		state="begin"

-	}

-	state=="begin" && /^From[ \t]/ {

 		state="headers"

 	}

 	state=="headers" && /^From:/ {

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

 		msg=msg $0 "\n"

 	}

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

-		state="body"

+		state="prebody"

 	}

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

 		state="diff"

 		print > ENVIRON["diffpath"]

 	}

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

+		print msg > "/env/msg"

+		state="body"

+	}

 	state=="body" {

 		print > "/env/msg"

 	}

@@ -78,9 +79,11 @@

 	# force re-reading env

 	rc -c '

-		echo $date

+		flag -e

+		echo applying $msg | sed 1q

 		date=`{seconds $date}

 		ape/patch -p1 < $diffpath

+		git/walk -fRMA

 		hash=`{git/save -n $name -e $email -m $msg -d $date $parents}

 		echo $hash > $refpath

 	'