Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-dev
Navigation:
Lists: gentoo-dev: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-dev@g.o
From: James Cloos <cloos@...>
Subject: Re: Re: Portage Git migration - clean cut or git-cvsserver
Date: Fri, 01 Jun 2012 20:14:52 -0400
>>>>> "WH" == William Hubbs <williamh@g.o> writes:

WH> My big complaint about merge commits is if you do a git show <hash> on
WH> a merge commit, you get nothing,

With current git and proper merge logs you get useful info.

   The headers contain the hashes, so you can get the list of
   commits pulled by that merge.

   The signed tag log is show.

   And merge conflicts also are shown.

Based on the hashes in the Merge: header, you can use git log to see the
individual commits or git diff to see the whole picture at once.

Linus’ current tip is a good example:

     cd .../linux
     git show 1193755ac632

So, Gentoo shouldn't prohibit merges.  Instead, it should demand that
all merges be of signed tags.

The plan includes signed commits anyway, so signed tags for pulls will be
fully supported by any version of git which might be used.

-JimC
-- 
James Cloos <cloos@...>         OpenPGP: 1024D/ED7DAEA6


References:
Re: Portage Git migration - clean cut or git-cvsserver
-- Duncan
Re: Re: Portage Git migration - clean cut or git-cvsserver
-- Dirkjan Ochtman
Re: Re: Portage Git migration - clean cut or git-cvsserver
-- Rich Freeman
Re: Portage Git migration - clean cut or git-cvsserver
-- Duncan
Re: Re: Portage Git migration - clean cut or git-cvsserver
-- Robin H. Johnson
Re: Re: Portage Git migration - clean cut or git-cvsserver
-- Dirkjan Ochtman
Re: Re: Portage Git migration - clean cut or git-cvsserver
-- Robin H. Johnson
Re: Re: Portage Git migration - clean cut or git-cvsserver
-- Rich Freeman
Re: Re: Portage Git migration - clean cut or git-cvsserver
-- William Hubbs
Re: Re: Portage Git migration - clean cut or git-cvsserver
-- Ciaran McCreesh
Re: Re: Portage Git migration - clean cut or git-cvsserver
-- William Hubbs
Navigation:
Lists: gentoo-dev: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
Re: Re: Portage Git migration - clean cut or git-cvsserver
Next by thread:
Re: Re: Portage Git migration - clean cut or git-cvsserver
Previous by date:
Re: multiprocessing.eclass: doing parallel work in bash
Next by date:
Re: Re: Portage Git migration - clean cut or git-cvsserver


Updated Jun 29, 2012

Summary: Archive of the gentoo-dev mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.