threads / discuss / 23653
Subject: git fast-import crashes importing commits with more than one author
git fast-import does not support commits with more than one author. I try to import bzr repository and it crashes.
Here is info how to make bzr commit that couldn't be imported to git http://doc.bazaar.canonical.com/latest/en/user-guide/recording_changes.html#giving-credit-for-a-change
Andreas SchwabRe: git fast-import crashes importing commits with more than one author
Giedrius Slavinskas <giedrius.slavinskas@gmail.com> writes:
> git fast-import does not support commits with more than one author. I > try to import bzr repository and it crashes.
You can find a patch here: <http://bazaar.launchpad.net/~schwab-linux-m68k/bzr-fastimport/fastimport.dev/revision/262>
Andreas.
-- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
Dmitrijs LedkovsRe: git fast-import crashes importing commits with more than one author
On 1 May 2010 17:36, Andreas Schwab <schwab@linux-m68k.org> wrote:
> Giedrius Slavinskas <giedrius.slavinskas@gmail.com> writes: > >> git fast-import does not support commits with more than one author. I >> try to import bzr repository and it crashes. > > You can find a patch here: > <http://bazaar.launchpad.net/~schwab-linux-m68k/bzr-fastimport/fastimport.dev/revision/262> > > Andreas.
Although this is fine shouldn't we put the additional authors to the signed-off: lines in the git commit message?
--Dima.
Junio C HamanoRe: git fast-import crashes importing commits with more than one author
Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> writes:
> On 1 May 2010 17:36, Andreas Schwab <schwab@linux-m68k.org> wrote: >> Giedrius Slavinskas <giedrius.slavinskas@gmail.com> writes: >> >>> git fast-import does not support commits with more than one author. I >>> try to import bzr repository and it crashes. >> >> You can find a patch here: >> <http://bazaar.launchpad.net/~schwab-linux-m68k/bzr-fastimport/fastimport.dev/revision/262> >> >> Andreas. > > Although this is fine shouldn't we put the additional authors to the > signed-off: lines in the git commit message?
If an author didn't sign-off in the log message, a tool shouldn't add it automatically. Doing so makes S-o-b meaningless.
Dmitrijs LedkovsRe: git fast-import crashes importing commits with more than one author
On 1 May 2010 18:19, Junio C Hamano <gitster@pobox.com> wrote:
> Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> writes: > >> On 1 May 2010 17:36, Andreas Schwab <schwab@linux-m68k.org> wrote: >>> Giedrius Slavinskas <giedrius.slavinskas@gmail.com> writes: >>> >>>> git fast-import does not support commits with more than one author. I >>>> try to import bzr repository and it crashes. >>> >>> You can find a patch here: >>> <http://bazaar.launchpad.net/~schwab-linux-m68k/bzr-fastimport/fastimport.dev/revision/262> >>> >>> Andreas. >> >> Although this is fine shouldn't we put the additional authors to the >> signed-off: lines in the git commit message? > > If an author didn't sign-off in the log message, a tool shouldn't add it > automatically. Doing so makes S-o-b meaningless. >
Fair enough. I'm justing thinking on how to support round-tripping to bzr with import/export cause there are a few other properties bzr needs to recreate identical repository. Is it more appropriate for the marks format revision (bzr side of it)?
Andreas EricssonRe: git fast-import crashes importing commits with more than one author
On 05/01/2010 07:28 PM, Dmitrijs Ledkovs wrote:
> On 1 May 2010 18:19, Junio C Hamano<gitster@pobox.com> wrote: >> Dmitrijs Ledkovs<dmitrij.ledkov@ubuntu.com> writes: >> >>> On 1 May 2010 17:36, Andreas Schwab<schwab@linux-m68k.org> wrote: >>>> Giedrius Slavinskas<giedrius.slavinskas@gmail.com> writes: >>>> >>>>> git fast-import does not support commits with more than one author. I >>>>> try to import bzr repository and it crashes. >>>> >>>> You can find a patch here: >>>> <http://bazaar.launchpad.net/~schwab-linux-m68k/bzr-fastimport/fastimport.dev/revision/262> >>>> >>>> Andreas. >>> >>> Although this is fine shouldn't we put the additional authors to the >>> signed-off: lines in the git commit message? >> >> If an author didn't sign-off in the log message, a tool shouldn't add it >> automatically. Doing so makes S-o-b meaningless. >> > > Fair enough. I'm justing thinking on how to support round-tripping to > bzr with import/export cause there are a few other properties bzr > needs to recreate identical repository. Is it more appropriate for the > marks format revision (bzr side of it)?
Add
Co-authored-by: Some One <some.one@example.foo>
and parse that when sending back to bzr. That way you get attribution properly in both tools, in a way.
-- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 Considering the successes of the wars on alcohol, poverty, drugs and terror, I think we should give some serious thought to declaring war on peace.