Re: [PATCH] Button added to performs a GUI diff (inline)

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sep 8, 2007, 23:34 UTC
Message-ID: <Pine.LNX.4.64.0709090031260.28586@racer.site>
In-Reply-To: <200709081231.26894.pmdumuid@pezdell>

Hi,

On Sat, 8 Sep 2007, Pierre Marc Dumuid wrote:

> From bd43cca7aa88282455b6bbe6e2f9d8134da1029c Mon Sep 17 00:00:00 2001
> From: Pierre Marc Dumuid <pierre.dumuid@adelaide.edu.au>
> Date: Sat, 8 Sep 2007 00:32:10 +0930
> Subject: [PATCH] Button added to performs a GUI diff

Almost! Just make sure that you are sending this patch with the correct Sender and put the Subject: line as subject of your mail.

And then describe in more detail what the patch does (This commit adds a button to gitk to easily look at diffs between a commit and its first parent. It uses the GUI tool selected in merge.tool to visualize the diff, erroring out if none was specified.)

Show 5 quoted lines

> +    if {[catch {exec git cat-file -p $sha1string^:$fname > .gitk_diffolder} err] 
> +	|| [catch {exec git cat-file -p $sha1string:$fname > .gitk_diffnewer} err]} {
> +	error_popup "Invalid file selected for comparison"
> +	return
> +    }

I think I found a solution for removing the temporary files: man n after.

Ciao, Dscho