]> git.ozlabs.org Git - next-scripts/blobdiff - do_merge
remove support for quilt trees
[next-scripts] / do_merge
index b0caba0b42a7043e6f0fb9dae340f0530f3e7ad1..806fc67a502179ab1b019176f6890a796e2b82e4 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -56,7 +56,7 @@ fi
 
 heads=$(awk -F '\t' '
        /^#/ { next; }
-       $2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }
+       $2=="git" { printf("%s/%s ", $3, $5); }
        $2=="branch" { printf("branch/%s ", $1); }' "$CTRL_FILE")
 
 need_build=false