RE: co-authoring commits

From: Jason Pyeron <jpyeron@pdinc.us>
Date: Jun 18, 2015, 10:54 UTC
Message-ID: <FBF98192E9F44B6E97F211B961DC7905@black7>
In-Reply-To: <20150617225224.GF4076@thunk.org>

Show 14 quoted lines

> -----Original Message-----
> From: Theodore Ts'o
> Sent: Wednesday, June 17, 2015 6:52 PM
> 
> On Wed, Jun 17, 2015 at 10:26:32PM +0200, Tuncer Ayaz wrote:
> > 
> > By allowing multiple authors, you don't have to decide who's the 
> > primary author, as in such situations usually there is no 
> primary at 
> > all. I sometimes deliberately override the author when 
> committing and 
> > add myself just as another co-author in the commit message, but as 
> > others have noted it would be really great if we can just specify 
> > multiple authors.

<snip/>

Show 5 quoted lines

> One could imagine some frankly, quite rare example where 
> there is a team of people who votes on each commit before it 
> gets sent out and where everyone is equal and there is no 
> hierarchy.  In that case, perhaps you could set the from 
> field to a mailing list address.

This is a perfect use the signed commit by multiple persons. Git already supports it (under the hood and in reporting).

A quick google pulled up my notes on this:

http://marc.info/?l=git&m=140845378317052&w=2

$ cat merge-multisigs.sh
#!/bin/bash
(
 for i in "$@"
 do
  gpg --dearmor < "$i"
 done
) | gpg --enarmor

$ cat write-commit.ruby #!/usr/bin/irb require 'fileutils' file = File.open(ARGV[0], "rb") content = file.read header = "commit #{content.length}\0" store = header + content require 'digest/sha1' sha1 = Digest::SHA1.hexdigest(store) require 'zlib' zlib_content = Zlib::Deflate.deflate(store) path = '.git/objects/' + sha1[0,2] + '/' + sha1[2,38] FileUtils.mkdir_p(File.dirname(path)) File.open(path, 'w') { |f| f.write zlib_content }

--
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-                                                               -
- Jason Pyeron                      PD Inc. http://www.pdinc.us -
- Principal Consultant              10 West 24th Street #100    -
- +1 (443) 269-1555 x333            Baltimore, Maryland 21218   -
-                                                               -
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-