From: Franck <vagabon.xyz@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Re: [QUESTION] about .git/info/grafts file
Date: Wed, 18 Jan 2006 18:47:54 +0100 [thread overview]
Message-ID: <cda58cb80601180947j48a5396t@mail.gmail.com> (raw)
In-Reply-To: <cda58cb80601170932o6f955469y@mail.gmail.com>
Hi,
Could anybody shed some light there ? It would be very nice.
Thanks
Franck
2006/1/17, Franck <vagabon.xyz@gmail.com>:
> Hi,
>
> I'm wondering why the "grafts" files is not involved during
> push/pull/clone operations ?
>
> Another question regarding grafting use case. Let's say I have my
> origin branch looks like:
>
> origin ---0---1---<snip>---300 000---300 001---300 002
>
> Let's say that the 300 000th commit is where I started my work by using:
>
> $ git-checkout -b master <300 000 shaid>
>
> I do some work on master branch and get the following
>
> a---b---c---d master
> /
> origin ---0---1---...---300,000---300,001---300,002
>
> Now, I would like to make my own public repository based on my work
> but before pushing master branch in that repo I would like to get rid
> of all unused commits [0 299,999]. Indeed each of these commits do not
> have useful history for my work. So I used grafts things to have:
>
> a---b---c---d master
> /
> origin 300,000---300,001---300,002
>
> But now if I ask to git for:
>
> $ git-merge-base master origin
> # nothing
>
> So git failed to found the common commit object which should be 300,000. Why ?
>
> In other the hand, if I use grafting to get:
>
> a---b---c---d master
> /
> origin 2999,999---300,000---300,001---300,002
>
> $ git-merge-base master origin
> 2dcaaf2decd31ac9a21d616604c0a7c1fa65d5a4
>
> So now git found the common commit. Can anybody explain me why ?
>
> Do you think it's a good usage of git ? Or should I do otherwise to
> setup my public repository ?
>
> Thanks
> --
> Franck
>
next prev parent reply other threads:[~2006-01-18 17:54 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cda58cb80601170928r252a6e34y@mail.gmail.com>
2006-01-17 17:32 ` [QUESTION] about .git/info/grafts file Franck
2006-01-18 17:47 ` Franck [this message]
2006-01-19 0:40 ` Junio C Hamano
2006-01-19 10:51 ` Franck
2006-01-19 13:09 ` Petr Baudis
2006-01-19 16:58 ` Linus Torvalds
2006-01-19 17:30 ` Petr Baudis
2006-01-19 17:33 ` Franck
2006-01-19 17:49 ` Linus Torvalds
2006-01-19 18:24 ` Junio C Hamano
2006-01-19 18:24 ` Junio C Hamano
2006-01-20 13:43 ` Franck
2006-01-19 11:10 ` Andreas Ericsson
2006-01-19 13:05 ` Petr Baudis
2006-01-19 13:31 ` Franck
2006-01-19 13:44 ` Andreas Ericsson
2006-01-19 17:45 ` Petr Baudis
2006-01-20 20:48 ` Ryan Anderson
2006-01-20 1:14 ` Junio C Hamano
2006-01-20 10:07 ` Franck
2006-01-20 17:59 ` Junio C Hamano
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=cda58cb80601180947j48a5396t@mail.gmail.com \
--to=vagabon.xyz@gmail.com \
--cc=git@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).