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>
Bert Wesarg committed
Dec 9, 2010 at 21:47 UTC
6459d7c046e5ab618ffde2d5a04dc83b5f97a600
1 file changed
+2
-1
lib/diff.tcl
+2
-1
@@ -382,6 +382,8 @@ proc read_diff {fd conflict_size cont_info} {
382
foreach {line markup} [parse_color_line $line] break
383
set line [string map {\033 ^} $line]
384
385
+ set tags {}
386
+
387
# -- Check for start of diff header.
388
if { [string match {diff --git *} $line]
389
|| [string match {diff --cc *} $line]
@@ -426,7 +428,6 @@ proc read_diff {fd conflict_size cont_info} {
428
|| [string match {Binary files * and * differ} $line]
429
|| $line eq {\ No newline at end of file}
430
|| [regexp {^\* Unmerged path } $line]} {
429
- set tags {}
431
} elseif {$is_3way_diff} {
432
set op [string range $line 0 1]
433
switch -- $op {