From: "Shawn O. Pearce" <spearce@spearce.org>
To: "Stephen R. van den Berg" <srb@cuci.nl>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [RFC] cherry-pick using multiple parents to implement -x
Date: Mon, 8 Sep 2008 07:38:07 -0700 [thread overview]
Message-ID: <20080908143807.GB10252@spearce.org> (raw)
In-Reply-To: <20080908115129.GA19031@cuci.nl>
"Stephen R. van den Berg" <srb@cuci.nl> wrote:
> If we were to put the SHA1-ref somewhere in the commit message,
> finding references to a certain commit through cherry-picks becomes
> rather disk/CPU-intensive.
>
> Would there be any objections against extending the on-disk format to
> accomodate something like the following:
>
> commit 7df437e56b5a2c5ec7140dd097b517563db4972c
> tree a006f20b481d811ccb4846534ef6394be5bc78a8
> parent ff1e8bfcd69e5e0ee1a3167e80ef75b611f72123
> parent bbb896d8e10f736bfda8f587c0009c358c9a8599
> cousin 6ffaecc7d8b2c3c188a2efa5977a6e6605d878d9
> cousin a1184d85e8752658f02746982822f43f32316803
> author Junio C Hamano <gitster@pobox.com> 1220153499 -0700
> committer Junio C Hamano <gitster@pobox.com> 1220153499 -0700
>
> Whereas cherry-pick would (optionally) generate a cousin reference for every
> commit it picks.
Sorry for wandering into a thread in the middle. But we've already
been down this road before, and decided the additional header wasn't
worth it from cherry-pick. What's changed? The fact that gitk
wants to hyperlink this? Why can't it just regex out a string of
hex digits longer than 6 and see if there is a commit that matches?
--
Shawn.
next prev parent reply other threads:[~2008-09-08 14:40 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-07 10:34 [RFC] cherry-pick using multiple parents to implement -x Stephen R. van den Berg
2008-09-07 17:28 ` Jeff King
2008-09-07 19:56 ` Stephen R. van den Berg
2008-09-07 20:04 ` Jeff King
2008-09-07 20:22 ` Stephen R. van den Berg
2008-09-08 1:49 ` Jeff King
2008-09-08 6:57 ` Stephen R. van den Berg
2008-09-07 17:28 ` Junio C Hamano
2008-09-07 20:10 ` Stephen R. van den Berg
2008-09-07 21:16 ` Thomas Rast
2008-09-07 22:22 ` Junio C Hamano
2008-09-07 22:00 ` Junio C Hamano
2008-09-08 7:37 ` Paolo Bonzini
2008-09-08 7:55 ` Junio C Hamano
2008-09-07 23:53 ` Junio C Hamano
2008-09-08 11:51 ` Stephen R. van den Berg
2008-09-08 13:04 ` Paolo Bonzini
2008-09-08 13:42 ` Stephen R. van den Berg
2008-09-08 14:37 ` Jakub Narebski
2008-09-08 14:57 ` Paolo Bonzini
2008-09-08 14:38 ` Shawn O. Pearce [this message]
2008-09-08 14:58 ` Stephen R. van den Berg
2008-09-08 15:00 ` Shawn O. Pearce
2008-09-09 8:51 ` Stephen R. van den Berg
2008-09-08 15:04 ` Paolo Bonzini
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=20080908143807.GB10252@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=srb@cuci.nl \
/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).