public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Paul Jackson <pj@sgi.com>
To: Greg KH <greg@kroah.com>
Cc: khali@linux-fr.org, torvalds@osdl.org, akpm@osdl.org,
	jgarzik@pobox.com, rdunlap@xenotime.net,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Document patch subject line better
Date: Mon, 3 Oct 2005 20:12:37 -0700	[thread overview]
Message-ID: <20051003201237.4c4b16f1.pj@sgi.com> (raw)
In-Reply-To: <20051003212200.GA28300@kroah.com>

Greg wrote (of the "---" line):
> No, my fix just always added it.

My preference would be to only add the "---" line
when starting with a brand new, empty patch file.

If an existing version of the patch file exists,
then just copy over the entire header (up to the
first actual patch) as is, no change.  If I choose
to edit the patch file header and remove the "---"
line, or do any other edit to it (short of creating
a line that looks like the start of a patch) then
quilt should respect that.

The following patch seems to accomplish this.

--- refresh.old	2005-10-03 17:31:41.000000000 -0700
+++ refresh	2005-10-03 20:02:04.000000000 -0700
@@ -247,7 +247,9 @@ fi
 
 mkdir -p $(dirname $patch_file)
 
-if ! cat_file $patch_file | patch_header > $tmp_header
+[ -s $patch_file ] || echo -e "\n---\n" > $tmp_header
+
+if ! cat_file $patch_file | patch_header >> $tmp_header
 then
 	die 1
 fi


-- 
                  I won't rest till it's the best ...
                  Programmer, Linux Scalability
                  Paul Jackson <pj@sgi.com> 1.925.600.0401

  reply	other threads:[~2005-10-04  3:12 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-10-03  7:29 [PATCH] Document patch subject line better Paul Jackson
2005-10-03  8:12 ` Peter Zijlstra
2005-10-03  8:42   ` Paul Jackson
2005-10-03  9:22     ` Peter Zijlstra
2005-10-03 15:06 ` Linus Torvalds
2005-10-03 15:54   ` Paul Jackson
2005-10-03 16:04     ` Greg KH
2005-10-03 21:02       ` Jean Delvare
2005-10-03 21:22         ` Greg KH
2005-10-04  3:12           ` Paul Jackson [this message]
2005-10-04  0:54         ` Paul Jackson
2005-10-03 20:40     ` Jean Delvare
2005-10-03 20:45       ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20051003201237.4c4b16f1.pj@sgi.com \
    --to=pj@sgi.com \
    --cc=akpm@osdl.org \
    --cc=greg@kroah.com \
    --cc=jgarzik@pobox.com \
    --cc=khali@linux-fr.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rdunlap@xenotime.net \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox