[tor-bugs] #2374 [Development Progress]: or-cvs list doesn't send mail for merges or tags

[Tor Bug Tracker & Wiki]

#2374: or-cvs list doesn't send mail for merges or tags
-------------------------+--------------------------------------------------
 Reporter:  cypherpunks  |        Type:  defect              
   Status:  new          |    Priority:  normal              
Milestone:               |   Component:  Development Progress
  Version:               |    Keywords:                      
   Parent:               |  
-------------------------+--------------------------------------------------

Comment(by nickm):

 It looks like our script is based on the one in githax, but with a bunch
 of other stuff added too.  I'm not merging it back to githax as-is, since
 it's scarily monolithic, but you can see it in sebastian's "update_hooks"
 githax branch.

 The relevant incantation is:
 {{{
                git-format-patch --subject-
 prefix="$projectname/${refname#refs/heads/}" \
                             --stdout "$oldrev..$newrev" |
                             formail -s /srv/git.torproject.org/git-
 helpers/copy
 headers.pl | formail -I "To: $recipients" -R From: Patch-Author: -I "From:
 $GL_USER at torproject.org" -I Date: -s /usr/sbin/sendmail -t
 }}}

 FWICT, there doesn't seem to be a way to make git format-patch do with we
 want.  We are probably going to need to do some chicanery with post-
 processing the results of git log -p, probably with a perl script.

 Another question is: which git log -p should we use?  By default, git log
 -p says nothing about merge bodies.  Our choices are "git log -p -m",
 "git log -p -c", and "git log -p --cc".  Please see the git log manpage
 for a description of each, and play with them a little to see how they
 work for you.  Note also that I think the -c and --cc variants do not
 generate message bodies for sufficiently conflict-free merges: we could
 safely omit mail for such merges, as it has nothing to add.

 I'm going to hack up a quick and dirty postprocessing script, to see if I
 can.

-- 
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/2374#comment:4>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online