Re: What's cooking in git.git (Jun 2010, #04; Wed, 23)

From

Johannes Sixt <j.sixt@viscovery.net>

Date

Jun 24, 2010, 14:48 UTC

Message-ID

<4C23702F.8030707@viscovery.net>

In-Reply-To

<7viq59e6zn.fsf@alter.siamese.dyndns.org>

Am 6/24/2010 0:09, schrieb Junio C Hamano:

> * cp/textconv-cat-file (2010-06-09) 4 commits
>  - [DONTMERGE] git gui: use textconv filter for diff and blame

This git-gui patch needs a fixup.

-- Hannes

diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index b02d2e5..c628750 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -280,7 +280,7 @@ proc start_show_diff {cont_info {add_opts {}}} {
 			lappend cmd diff-files
 		}
 	}
-	if {![is_config_false gui.textconv] && [git-version >ñ.6.1]} {
+	if {![is_config_false gui.textconv] && [git-version >= 1.6.1]} {
 		lappend cmd --textconv
 	}