From: Luben Tuikov <ltuikov@yahoo.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-pickaxe: blame rewritten.
Date: Fri, 13 Oct 2006 14:59:42 -0700 (PDT) [thread overview]
Message-ID: <20061013215942.36919.qmail@web31806.mail.mud.yahoo.com> (raw)
In-Reply-To: <7vy7rjc2vg.fsf@assigned-by-dhcp.cox.net>
--- Junio C Hamano <junkio@cox.net> wrote:
> Luben Tuikov <ltuikov@yahoo.com> writes:
>
> > --- Junio C Hamano <junkio@cox.net> wrote:
> >> Luben Tuikov <ltuikov@yahoo.com> writes:
> >>
> >> > Junio, is it possible to also print the "previous" commit?
> >> > I mean, is it tenable to print the commit such that
> >> > a "git-diff C B -- A:file" will give a diff of the block of lines
> >> > we're looking at?
> >>
> >> There is no single "previous" in general. Which side of the
> >> merge would you take?
> >
> > The parent commit.
>
> There is no single "the parent commit" in general. Which side
> of the merge would you take?
Yes, I realise that...
I guess I'm trying to get to a successful implementation of
the intention of commit 65910395c08e3dc4be685a9a9f60adfa61c89aa5
(later reverted for a good reason).
It is ok if this is not possible. After all, the absolutely
unambiguous way is blame->commit->blame->commit->..., etc,
due to multiple parenting.
> Also remeber, when we blame a line to a revision (unless we do
> not limit the blame with v2.6.18.. and --since=2.weeks which
> only git-pickaxe can do), the line is known to have been
> introduced by _that_ commit.
That is what we want.
(fully agree with your previous comment that we limit _after_
placing blame on a commit...)
> If there were a corresponding line
> in "the parent commit" for that line, we would not have assigned
> the blame to the commit, but the blame would have been passed
> down to "the parent commit" already.
Indeed.
Luben
next prev parent reply other threads:[~2006-10-13 21:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-12 8:52 [PATCH] git-pickaxe: blame rewritten Junio C Hamano
2006-10-12 15:58 ` Linus Torvalds
2006-10-12 19:09 ` Junio C Hamano
2006-10-12 20:10 ` Luben Tuikov
2006-10-13 20:31 ` Junio C Hamano
2006-10-13 5:35 ` Junio C Hamano
2006-10-12 19:31 ` Luben Tuikov
2006-10-12 22:20 ` Junio C Hamano
2006-10-13 20:54 ` Luben Tuikov
2006-10-13 21:38 ` Junio C Hamano
2006-10-13 21:59 ` Luben Tuikov [this message]
2006-10-13 22:50 ` Junio C Hamano
2006-10-13 0:06 ` Junio C Hamano
2006-10-13 1:04 ` Luben Tuikov
2006-10-13 1:45 ` Junio C Hamano
2006-10-12 21:55 ` Jakub Narebski
2006-10-12 22:47 ` Petr Baudis
2006-10-12 23:35 ` 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=20061013215942.36919.qmail@web31806.mail.mud.yahoo.com \
--to=ltuikov@yahoo.com \
--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 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).