From 6459d7c046e5ab618ffde2d5a04dc83b5f97a600 Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Thu, 9 Dec 2010 21:47:57 +0100 Subject: [PATCH] git-gui: always reset the current tag Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts --- lib/diff.tcl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/diff.tcl b/lib/diff.tcl index 2290919..91ed7c6 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -382,6 +382,8 @@ proc read_diff {fd conflict_size cont_info} { foreach {line markup} [parse_color_line $line] break set line [string map {\033 ^} $line] + set tags {} + # -- Check for start of diff header. if { [string match {diff --git *} $line] || [string match {diff --cc *} $line] @@ -426,7 +428,6 @@ proc read_diff {fd conflict_size cont_info} { || [string match {Binary files * and * differ} $line] || $line eq {\ No newline at end of file} || [regexp {^\* Unmerged path } $line]} { - set tags {} } elseif {$is_3way_diff} { set op [string range $line 0 1] switch -- $op { -- 2.11.4.GIT