From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 15 May 2014 01:17:31 +0000 (+1000)
Subject: update_trees: make the patch format explicit
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=9f1441da46c87531635fe742016124db2069db24;p=next-scripts

update_trees: make the patch format explicit
---

diff --git a/update_trees b/update_trees
index 266e9c2..d5c8697 100755
--- a/update_trees
+++ b/update_trees
@@ -83,7 +83,7 @@ for name in $quilters; do
 
 	for f in $patches; do
 		old_head=$(git rev-parse --verify HEAD)
-		execute git am "../quilt/$name/$f"
+		execute git am --patch-format=mbox "../quilt/$name/$f"
 		new_head=$(git rev-parse --verify HEAD)
 		[ "$new_head" = "$old_head" ] && {
 			echo "Tree unchanged, please check ..."