From: Ben Lau <benlau@ust.hk>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: How to create a new branch based on a tag?
Date: Sat, 22 Oct 2005 03:14:16 +0800 [thread overview]
Message-ID: <43593E08.1060208@ust.hk> (raw)
In-Reply-To: <7vzmp3319v.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
>Ben Lau <benlau@ust.hk> writes:
>
>
>
>>>The way you know is as good as it gets. v2.6.11-tree case is
>>>really an unfortunate special case.
>>>
>>>
>>>
>>What is wrong with the v2.6.11-tree? I just thought it is a duplicate tag
>>of v2.6.11.
>>
>>
>
>They are not *wrong* per-se. They are tags to tree objects
>without any associated commit history -- that makes them
>inappropriate to be used as branch heads.
>
>Linus or somebody authoritative could do:
>
> $ commit=$(echo v2.6.11 | \
> git-commit-tree c39ae07f393806ccf406ef966e9a15afc43cc36a)
> $ git-tag -s -m 'v2.6.11 canonical "fake" commit' v2.6.11fake $commit
>
>and tell everybody interested to have:
>
>1da177e4c3f41524e886b7f1b8a0c1fc7321cac2 xxxxxxxxxx
>
>(where xxxxx... is the value of $commit above) in their
>info/grafts file. Then we *could* pretend that v2.6.12-rc2's
>parent is v2.6.11. You could branch off from v2.6.11fake commit
>and base your development, and later you could merge that into
>later development history (say, v2.6.14-rc5) if you wanted to.
>
>If Linus does something like the above, the graft probably be
>better done between the current v2.6.12-rc2 based commit history
>and the corresponding commit in the history resurrected from
>BKCVS (torvalds/old-2.6-bkcvs.git). Then you could even base
>your development on top of v2.4.0 ;-).
>
>Funnily, v2.6.12-rc2 commit in the current history and BKCVS
>v2.6.12-rc2 commit in the resurrected history have different
>tree IDs.
>
>I am however not quite sure how useful the above would be,
>though. EVen between 2.6.11 and 2.6.12-rc2 much have happened,
>so unless the changes you are making apply to the part that did
>not change between those two, merge conflict resolution might be
>quite a chore.
>
>
>-
>To unsubscribe from this list: send the line "unsubscribe git" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
Thanks for detail explanation.
It is a little bit difficult for me. The result of `git log`
shows that the eldest commit is 1da177e4c3f41524e886b7f1b8a0c1fc7321cac2
which is linux-2.6.12-rc2. Is that means the git repository do not
store the history before this tag? Then how can `git-read-tree
v2.6.11` fetchs the content of v2.6.11?
By the way, How could you find the
c39ae07f393806ccf406ef966e9a15afc43cc36a out?
I have followed your instuctions and now have my own 2.6.11
branch(my2.6.11). Should be fine
now. Many thanks to all you guys.
next prev parent reply other threads:[~2005-10-21 7:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-21 14:57 How to create a new branch based on a tag? Ben Lau
2005-10-21 3:37 ` Martin Langhoff
2005-10-21 16:15 ` Ben Lau
2005-10-21 3:50 ` Junio C Hamano
2005-10-21 16:23 ` Ben Lau
2005-10-21 5:08 ` Junio C Hamano
2005-10-21 19:14 ` Ben Lau [this message]
2005-10-21 8:20 ` 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=43593E08.1060208@ust.hk \
--to=benlau@ust.hk \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.