{"thread":{"id":"23982","subject":"git-quiltimport","startedAt":"2010-06-02T15:07:37Z","lastAt":"2010-06-02T15:07:37Z","messageCount":1,"participants":["Ian Molton"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"142826","messageId":"4C0673B9.20801@collabora.co.uk","threadId":"23982","inReplyTo":null,"subject":"git-quiltimport","fromName":"Ian Molton","fromEmail":"ian.molton@collabora.co.uk","sentAt":"2010-06-02T15:07:37Z","receivedAt":"2010-06-02T15:07:37Z","isPatch":false,"sender":{"key":"ian.molton@collabora.co.uk","avatar":null},"body":"Hi,\n\nI've written a little patch to git-quiltimport that helps it with some stupid\n quilt repos.\n\nIts still no use to me because it cant understand .bz2 compressed patches,\n but I thought this might help some folk out.\n\nHopefully t-bird wont mangle my patch...\n\n\n\n>From 475ce14394d75cadcc5c77ab1060a9a81bceaac4 Mon Sep 17 00:00:00 2001\nFrom: Ian Molton <ian.molton@collabora.co.uk>\nDate: Wed, 2 Jun 2010 15:59:25 +0100\nSubject: [PATCH] Add a --series option to git-quiltimport\n\n\tThis allows git-quiltimport to handle quilt patchsets with the\nseries fil in a nonstandard location.\n---\n Documentation/git-quiltimport.txt |    7 +++++++\n git-quiltimport.sh                |   10 ++++++++--\n 2 files changed, 15 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt\nindex 579e8d2..da509e0 100644\n--- a/Documentation/git-quiltimport.txt\n+++ b/Documentation/git-quiltimport.txt\n@@ -10,6 +10,7 @@ SYNOPSIS\n --------\n [verse]\n 'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]\n+                  [--series <file>]\n \n \n DESCRIPTION\n@@ -49,6 +50,12 @@ The default for the patch directory is patches\n or the value of the $QUILT_PATCHES environment\n variable.\n \n+--series <file>::\n+\tThe file to read the series information from.\n++\n+The default location for the series file is a\n+file called series in the patch directory.\n+\n Author\n ------\n Written by Eric Biederman <ebiederm@lnxi.com>\ndiff --git a/git-quiltimport.sh b/git-quiltimport.sh\nindex 9a6ba2b..85f27b1 100755\n--- a/git-quiltimport.sh\n+++ b/git-quiltimport.sh\n@@ -5,7 +5,8 @@ git quiltimport [options]\n --\n n,dry-run     dry run\n author=       author name and email address for patches without any\n-patches=      path to the quilt series and patches\n+patches=      path to the quilt patches\n+series=       quilt series file (default to $QUILT_PATCHES/series)\n \"\n SUBDIRECTORY_ON=Yes\n . git-sh-setup\n@@ -26,6 +27,10 @@ do\n \t\tshift\n \t\tQUILT_PATCHES=\"$1\"\n \t\t;;\n+        --series)\n+\t\tshift\n+\t\tQUILT_SERIES=\"$1\"\n+\t\t;;\n \t--)\n \t\tshift\n \t\tbreak;;\n@@ -47,6 +52,7 @@ fi\n \n # Quilt patch directory\n : ${QUILT_PATCHES:=patches}\n+: ${QUILT_SERIES:=$QUILT_PATCHES/series}\n if ! [ -d \"$QUILT_PATCHES\" ] ; then\n \techo \"The \\\"$QUILT_PATCHES\\\" directory does not exist.\"\n \texit 1\n@@ -134,5 +140,5 @@ do\n \t\tcommit=$( (echo \"$SUBJECT\"; echo; cat \"$tmp_msg\") | git commit-tree $tree -p $commit) &&\n \t\tgit update-ref -m \"quiltimport: $patch_name\" HEAD $commit || exit 4\n \tfi\n-done 3<\"$QUILT_PATCHES/series\"\n+done 3<\"$QUILT_SERIES\"\n rm -rf $tmp_dir || exit 5\n-- \n1.7.1\n\n"}]}