threads / patch / 10979

patchTweak git-quiltimport to allow more flexible series format

Subject: [PATCH] Tweak git-quiltimport to allow more flexible series format

## tl;dr

3 messages between Nov 22, 2007 and Nov 27, 2007. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Alexey Dobriyan· Nov 22, 2007, 13:48 UTC · lore

Make quiltimport also understand comments following patch name.

Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
---

 git-quiltimport.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to git-quiltimport.sh +1 −1

--- 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· Nov 22, 2007, 23:43 UTC · re: Alexey Dobriyan · lore

Re: [PATCH] Tweak git-quiltimport to allow more flexible series format

Alexey Dobriyan <adobriyan@sw.ru> writes:

Show 19 quoted lines

> Make quiltimport also understand comments following patch name.
>
> Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
> ---
>
>  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· Nov 27, 2007, 16:52 UTC · re: Junio C Hamano · lore

Re: [PATCH] Tweak git-quiltimport to allow more flexible series format

On Thu, Nov 22, 2007 at 03:43:53PM -0800, Junio C Hamano wrote:

Show 26 quoted lines

> Alexey Dobriyan <adobriyan@sw.ru> writes:
> 
> > Make quiltimport also understand comments following patch name.
> >
> > Signed-off-by: Alexey Dobriyan <adobriyan@sw.ru>
> > ---
> >
> >  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?