Re: Commit 140b378d07229e breaks gitk highlighting

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Sep 10, 2008 at 3:22 PM, Junio C Hamano <gitster@xxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux