Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org, Yann Dirson <ydirson@altern.org>
Subject: Re: [PATCH] [BUG] Add a test to check git-prune does not throw away revs hidden by a graft.
Date: Thu, 18 May 2006 15:25:29 -0700	[thread overview]
Message-ID: <7v64k3nf6u.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.64.0605181500470.10823@g5.osdl.org> (Linus Torvalds's message of "Thu, 18 May 2006 15:01:16 -0700 (PDT)")

Linus Torvalds <torvalds@osdl.org> writes:

> On Thu, 18 May 2006, Junio C Hamano wrote:
>> 
>> I haven't looked at what the test does, but I think he is
>> talking about the opposite.  fsck by design does not honor
>> grafts, and if you grafted a history back to your true root
>> commit, that "older" history will be lost.
>
> Ahh. Ok. Gotcha.
>
> 		Linus

Is it really OK?

I said "fsck by design does not honor" as a flamebait.

And what I said was completely untrue.  Sorry.

If you have a commit chain A->B->C and graft B away by saying
C's parent is A, fsck does read graft and discards B.  But that
is what the user asked to do, so I agree with your initial
response to Yann.

And the opposite case of grafting older history back to the real
root commit was a false alarm.  You would not lose such a
history, because the ancestry traversal will go right through
the real root and traverses the older history.

  reply	other threads:[~2006-05-18 22:25 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-05-18 21:35 [PATCH] [BUG] Add a test to check git-prune does not throw away revs hidden by a graft Yann Dirson
2006-05-18 21:37 ` Linus Torvalds
2006-05-18 21:46   ` Junio C Hamano
2006-05-18 22:01     ` Linus Torvalds
2006-05-18 22:25       ` Junio C Hamano [this message]
2006-05-18 22:20     ` Yann Dirson
2006-05-18 22:36       ` Junio C Hamano
2006-05-18 22:52       ` Yann Dirson
2006-05-18 22:53         ` Junio C Hamano
2006-05-19 18:55           ` Yann Dirson
2006-05-19 19:00             ` Jakub Narebski
2006-05-19 19:02             ` Linus Torvalds
2006-05-19 20:25               ` Yann Dirson
2006-05-19 20:45                 ` Linus Torvalds
2006-05-19 22:22               ` Junio C Hamano
2006-05-19 22:26               ` [PATCH] [BUG] Add a test to check git-prune does not throw awayrevs " David Lang

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=7v64k3nf6u.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=git@vger.kernel.org \
    --cc=torvalds@osdl.org \
    --cc=ydirson@altern.org \
    /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