Git development
 help / color / mirror / Atom feed
From: "Jason Pyeron" <jpyeron@pdinc.us>
To: <git@vger.kernel.org>
Cc: "'Junio C Hamano'" <gitster@pobox.com>,
	"'Josh Triplett'" <josh@joshtriplett.org>,
	"'Tuncer Ayaz'" <tuncer.ayaz@gmail.com>,
	"'Theodore Ts'o'" <tytso@mit.edu>
Subject: RE: co-authoring commits
Date: Thu, 18 Jun 2015 06:54:51 -0400	[thread overview]
Message-ID: <FBF98192E9F44B6E97F211B961DC7905@black7> (raw)
In-Reply-To: <20150617225224.GF4076@thunk.org>

> -----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/>
> 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   -
-                                                               -
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- 

  parent reply	other threads:[~2015-06-18 11:56 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-17 19:52 co-authoring commits Tuncer Ayaz
2015-06-17 19:58 ` Junio C Hamano
2015-06-17 20:26   ` Tuncer Ayaz
2015-06-17 20:57     ` Junio C Hamano
2015-06-17 21:17       ` josh
2015-06-17 20:59     ` josh
2015-06-17 21:51       ` Junio C Hamano
2015-06-17 22:07         ` Tuncer Ayaz
2015-06-17 22:28         ` josh
2015-06-17 22:44           ` Junio C Hamano
2015-06-18 21:25             ` Jakub Narębski
2015-06-19  4:25               ` Jeff King
2015-06-19 18:02                 ` Jakub Narębski
2015-06-17 22:52     ` Theodore Ts'o
2015-06-17 23:06       ` josh
2015-06-18 10:54       ` Jason Pyeron [this message]
2015-06-18 21:25       ` Tuncer Ayaz
2015-06-19 18:18         ` Jakub Narębski
2015-06-19 21:11           ` Tuncer Ayaz
2015-06-19 21:25             ` Jakub Narębski

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=FBF98192E9F44B6E97F211B961DC7905@black7 \
    --to=jpyeron@pdinc.us \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=josh@joshtriplett.org \
    --cc=tuncer.ayaz@gmail.com \
    --cc=tytso@mit.edu \
    /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