]> git.ozlabs.org Git - next-scripts/commitdiff
update_trees: make the patch format explicit
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 May 2014 01:17:31 +0000 (11:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 15 May 2014 01:17:31 +0000 (11:17 +1000)
update_trees

index 266e9c20ebc1319703a88af5e88f83642923e21e..d5c8697e96985c706b00bd458b1d2ae0b5a01c76 100755 (executable)
@@ -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 ..."