From: Sam Vilain <sam@vilain.net>
To: Junio C Hamano <junkio@cox.net>
Cc: Jakub Narebski <jnareb@gmail.com>, git@vger.kernel.org
Subject: Re: [RFC] [PATCH 0/5] Implement 'prior' commit object links (and
Date: Mon, 01 May 2006 13:25:30 +1200 [thread overview]
Message-ID: <4455638A.3070802@vilain.net> (raw)
In-Reply-To: <7v8xpmva9x.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano wrote:
>>We can fast-forward if (1) you pulled from "pu" the last time,
>>and (2) you haven't added anything on top of it on your own, and
>>(3) you pull from "pu" again, if the previous "pu" (i.e. your
>>"pu") is a parent of the updated "pu". We do not need "prior"
>>for that. The old "pu" being _one_ _of_ the parents, not even
>>necessarily be the first one, would do just fine.
>>
>>
>
>This part may want a bit more elaboration.
>
>Often, we see in the Linus kernel tree a fast forward of his tip
>from a recent commit Linus made to bunch of networking commits
>made by David S Miller. For example, Linus fast forwarded to
>18118c from David's tree before making this commit:
> [...]
>To David, the commits he has in the chain between 6b426e to
>18118c obviously suited the purpose of his tree better, and that
>was why these commits were made. And the fact Linus fast
>forwarded to the tip of David is an implicit statement by Linus
>that that results suits the purpose of Linus tree better as well
>compared to his old tip, presumably 6b426e.
>
>
Aha, now I see reason in the madness. So, the "prior" head is not stored
in the trees, and tracking the progress of actual head transitions is
loosely defined / a research topic. But demonstrably derivable. That
works for me.
Sam.
next prev parent reply other threads:[~2006-05-01 1:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-29 16:51 [RFC] [PATCH 0/5] Implement 'prior' commit object links (and linux
2006-04-29 17:35 ` Linus Torvalds
2006-04-29 18:07 ` Jakub Narebski
2006-04-29 19:30 ` Junio C Hamano
2006-04-29 18:27 ` Jakub Narebski
2006-04-29 20:44 ` Junio C Hamano
2006-04-29 20:58 ` Jakub Narebski
2006-04-30 15:21 ` Jakub Narebski
2006-04-30 23:19 ` Junio C Hamano
2006-05-01 0:50 ` Junio C Hamano
2006-05-01 1:25 ` Sam Vilain [this message]
2006-05-01 4:44 ` Jakub Narebski
2006-05-01 6:58 ` Junio C Hamano
2006-05-02 0:21 ` Sam Vilain
2006-05-02 7:08 ` Martin Langhoff
2006-05-01 0:05 ` Sam Vilain
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=4455638A.3070802@vilain.net \
--to=sam@vilain.net \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--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 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).