From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Thu, 9 Dec 2010 20:47:57 +0000 (+0100)
Subject: git-gui: always reset the current tag
X-Git-Tag: gitgui-0.14.0~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6459d7c046e5ab618ffde2d5a04dc83b5f97a600;p=git.git

git-gui: always reset the current tag

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---

diff --git a/lib/diff.tcl b/lib/diff.tcl
index 22909194d..91ed7c638 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 {