From: "Mark Levedahl" <mlevedahl@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Karl Hasselström" <kha@treskal.com>,
"Paul Mackerras" <paulus@samba.org>
Subject: Re: Commit 140b378d07229e breaks gitk highlighting
Date: Wed, 10 Sep 2008 16:03:35 -0400 [thread overview]
Message-ID: <30e4a070809101303u15b98bd5uc11f545fdb5a8835@mail.gmail.com> (raw)
In-Reply-To: <7vtzcnx0uc.fsf@gitster.siamese.dyndns.org>
On Wed, Sep 10, 2008 at 3:22 PM, Junio C Hamano <gitster@pobox.com> wrote:
>
> Feeding the following to "git diff-tree -r -s --stdin -- t" misbehaves
> with that change. The second line is skipped.
>
> 7c4d0219cf9ab6a7738a09ad7fec72d5e9f2ac67
> a786091b4a487bc08bbff4864717cf5d8383e983
> 4a09bc966449ca0a7e9a5bb70f91b47debdd7c4e
>
> This should fix it.
>
> diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
> index 1138c2d..a9e32c9 100644
> --- a/builtin-diff-tree.c
> +++ b/builtin-diff-tree.c
> @@ -71,8 +71,7 @@ static int diff_tree_stdin(char *line)
> line[len-1] = 0;
> if (get_sha1_hex(line, sha1))
> return -1;
> - obj = lookup_object(sha1);
> - obj = obj ? obj : parse_object(sha1);
> + obj = parse_object(sha1);
> if (!obj)
> return -1;
> if (obj->type == OBJ_COMMIT)
>
Yes, that fixes the problems I see.
Thanks,
Mark
prev parent reply other threads:[~2008-09-10 20:05 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-09 12:31 Commit 140b378d07229e breaks gitk highlighting Mark Levedahl
2008-09-10 16:01 ` Karl Hasselström
2008-09-10 19:22 ` Junio C Hamano
2008-09-10 20:03 ` Mark Levedahl [this message]
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=30e4a070809101303u15b98bd5uc11f545fdb5a8835@mail.gmail.com \
--to=mlevedahl@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kha@treskal.com \
--cc=paulus@samba.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).