Re: gitview 0.3

From: Aneesh Kumar <aneesh.kumar@gmail.com>
Date: Feb 2, 2006, 07:15 UTC
Message-ID: <cc723f590602012315p2ba6e3f5rcf34df4bdefa5cb7@mail.gmail.com>
In-Reply-To: <7vzmlauw35.fsf@assigned-by-dhcp.cox.net>

On 2/2/06, Junio C Hamano <junkio@cox.net> wrote:

Show 5 quoted lines

> Nhe choice of colors is intuitive).
>
> It might match more people's expectation if --with-diff were the
> default.
>

Done. I made it to take option --without-diff for guys like me

Show 19 quoted lines

> This patch might make merges easier to read.
>
> -- >8 --
> [PATCH] Use "diff-tree -c" to display merges a bit more readably.
>
> --- a/gitview   2006-02-01 21:16:43.000000000 -0800
> +++ b/gitview   2006-02-01 21:46:24.000000000 -0800
> @@ -305,7 +305,7 @@
>                 return message
>
>         def diff_tree(self):
> -               fp = os.popen("git diff-tree --pretty -m -v -p " + " " + self.commit_sha1)
> +               fp = os.popen("git diff-tree --pretty -c -v -p " + " " + self.commit_sha1)
>                 diff = fp.read()
>                 fp.close()
>
>
>
>

I applied this patch . But the problem now is merge commits doesn't show the commit messages. Adding -m also didn't help. Any suggestion

-aneesh