On 1/25/08, Karl Hasselström <kha@xxxxxxxxxxx> wrote: > On 2008-01-25 08:34:53 -0500, Jon Smirl wrote: > > > On 1/25/08, Karl Hasselström <kha@xxxxxxxxxxx> wrote: > > > > > What command are you using to export patches? > > > > I am using "stg export" from one branch and then "stg import -s" on > > another. After I import the patch and do 'stg edit' on it, it has > > the signed-off-by line in it. When it is export from that branch the > > signed-off-by get added again. > > > > You don't want to strip the signed-off-by lines on import, they may > > be from other people. I would think that on export you could look > > and see if my signed-off-by line is already on the patch before > > adding it again. > > I haven't set up my templates to add sign-offs on export; instead, I > give --sign to "stg import". This always does the right thing: > > 1. It's smart enough to notice if my sign-off is already there, and > don't add another copy. > > 2. My sign-off is propagated even if the patches are transferred by > pulling instead of by email or "stg export". Yes, I added Signed-of-by to the export and mail templates. I did it six months ago and I had forgotten. I can fix this by just removing it from the export template. I've learned to use 'stg mail' now and it is the only way I publicly expose patches. It works to just add the Signed-off-by at the email stage. Longer term you may want to add a de-dupe check for the signed-off-by lines that gets called in all contexts. > > For patches that I write myself (so that they are never "stg > import"ed), I add the sign-off manually in the commit message, with > the aid of this elisp snippet: > > (defun sign-off () > "Insert sign-off line." > (interactive) > (git-append-sign-off (git-get-committer-name) (git-get-committer-email)))) > > Adding the sign-off conditionally in "stg mail" and "stg export", as > you suggest, could of course be done. But that would have to be > command line options, since the template system can't really express > that kind of transformation. > > -- > Karl Hasselström, kha@xxxxxxxxxxx > www.treskal.com/kalle > -- Jon Smirl jonsmirl@xxxxxxxxx - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html