# [PATCH] Tweak git-quiltimport to allow more flexible series format 3 messages from 2007-11-22 to 2007-11-27. Participants: Alexey Dobriyan, Junio C Hamano. Thread: https://gitlist.dev/t/10979 ## Alexey Dobriyan, 2007-11-22 13:48 Subject: [PATCH] Tweak git-quiltimport to allow more flexible series format Message-ID: <20071122134849.GB6240@localhost.sw.ru> URL: https://gitlist.dev/e/20071122134849.GB6240%40localhost.sw.ru ``` Make quiltimport also understand comments following patch name. Signed-off-by: Alexey Dobriyan --- git-quiltimport.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/git-quiltimport.sh +++ b/git-quiltimport.sh @@ -63,7 +63,7 @@ tmp_info="$tmp_dir/info" commit=$(git rev-parse HEAD) mkdir $tmp_dir || exit 2 -for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do +for patch_name in $(sed -e 's/#.*//' < "$QUILT_PATCHES/series" ); do if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then echo "$patch_name doesn't exist. Skipping." continue ``` ## Junio C Hamano, 2007-11-22 23:43 Subject: Re: [PATCH] Tweak git-quiltimport to allow more flexible series format Message-ID: <7vsl2x26di.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vsl2x26di.fsf%40gitster.siamese.dyndns.org In-Reply-To: <20071122134849.GB6240@localhost.sw.ru> ``` Alexey Dobriyan writes: > Make quiltimport also understand comments following patch name. > > Signed-off-by: Alexey Dobriyan > --- > > git-quiltimport.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > --- a/git-quiltimport.sh > +++ b/git-quiltimport.sh > @@ -63,7 +63,7 @@ tmp_info="$tmp_dir/info" > commit=$(git rev-parse HEAD) > > mkdir $tmp_dir || exit 2 > -for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do > +for patch_name in $(sed -e 's/#.*//' < "$QUILT_PATCHES/series" ); do > if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then > echo "$patch_name doesn't exist. Skipping." > continue Is this consistent with the way quilt groks the series file? IOW, does quilt forbid patchfile whose name contains a hash, and anything after a hash on the line is taken as comment? Can a line in a quilt series file name more than one patchfile? If so, are they whitespace separated? ``` ## Alexey Dobriyan, 2007-11-27 16:52 Subject: Re: [PATCH] Tweak git-quiltimport to allow more flexible series format Message-ID: <20071127165220.GA6220@localhost.sw.ru> URL: https://gitlist.dev/e/20071127165220.GA6220%40localhost.sw.ru In-Reply-To: <7vsl2x26di.fsf@gitster.siamese.dyndns.org> ``` On Thu, Nov 22, 2007 at 03:43:53PM -0800, Junio C Hamano wrote: > Alexey Dobriyan writes: > > > Make quiltimport also understand comments following patch name. > > > > Signed-off-by: Alexey Dobriyan > > --- > > > > git-quiltimport.sh | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > --- a/git-quiltimport.sh > > +++ b/git-quiltimport.sh > > @@ -63,7 +63,7 @@ tmp_info="$tmp_dir/info" > > commit=$(git rev-parse HEAD) > > > > mkdir $tmp_dir || exit 2 > > -for patch_name in $(grep -v '^#' < "$QUILT_PATCHES/series" ); do > > +for patch_name in $(sed -e 's/#.*//' < "$QUILT_PATCHES/series" ); do > > if ! [ -f "$QUILT_PATCHES/$patch_name" ] ; then > > echo "$patch_name doesn't exist. Skipping." > > continue > > Is this consistent with the way quilt groks the series file? > > IOW, does quilt forbid patchfile whose name contains a hash, and > anything after a hash on the line is taken as comment? It looks like hash inside a patch name is legal. > Can a line in a quilt series file name more than one patchfile? No. Which means we can probably do sed -e 's/^#//' -e 's/[ \t]#.*//' ... let me experiment bit more. > If so, are they whitespace separated? ```