git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Potapov <dpotapov@gmail.com>
To: Petr Baudis <pasky@suse.cz>
Cc: Brian Foster <brian.foster@innova-card.com>, git@vger.kernel.org
Subject: Re: Re: Re: fsck --full is Ok, but clones are not, "missing commits"?!
Date: Wed, 16 Apr 2008 20:23:38 +0400	[thread overview]
Message-ID: <20080416162338.GD3133@dpotapov.dyndns.org> (raw)
In-Reply-To: <20080416145900.GA10777@machine.or.cz>

On Wed, Apr 16, 2008 at 04:59:00PM +0200, Petr Baudis wrote:
> On Wed, Apr 16, 2008 at 04:14:24PM +0400, Dmitry Potapov wrote:
> > info/grafts should never be used during normal work.
> 
> I don't really agree with this advice in general. Grafts can be very
> useful especially when migrating to Git

I agree that they can be very useful in the process of migrating, but
I would not recommend to leave them _after_ the migration process is
complete.

> The _BAD_ grafts are those that replace list of commit's parents instead
> of just appending (typically to an empty one). I didn't actually have
> any idea people use grafts in such a twisted and perverse way... ;-)

They are used to replace _BAD_ commits imported from CVS. History in
CVS can be very strange and even with best conversation tools, you may
end up with something not exactly what you want. So, you want to replace
some commits with corrected versions of them. So, you add those commits
to Git repo, "fix" history, and then using gitk check that now you have
exactly what you want. If now the history is okay then you can use
git filter-branch to make those changes real.

Dmitry

  reply	other threads:[~2008-04-16 16:24 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <200804161334.17748.brian.foster@innova-card.com>
2008-04-16 11:48 ` Re: Re: fsck --full is Ok, but clones are not, "missing commits"?! Brian Foster
2008-04-16 12:14   ` Dmitry Potapov
2008-04-16 14:59     ` Petr Baudis
2008-04-16 16:23       ` Dmitry Potapov [this message]
2008-04-16 13:22   ` Johannes Sixt
2008-04-16 14:25     ` Dmitry Potapov
2008-04-16 14:56       ` Johannes Sixt
2008-04-16 16:17         ` Dmitry Potapov
2008-04-16 16:47           ` Jakub Narebski
2008-04-17  6:18           ` Johannes Sixt

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=20080416162338.GD3133@dpotapov.dyndns.org \
    --to=dpotapov@gmail.com \
    --cc=brian.foster@innova-card.com \
    --cc=git@vger.kernel.org \
    --cc=pasky@suse.cz \
    /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;
as well as URLs for NNTP newsgroup(s).