undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: always reset the current tag

Browse Source 
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
This commit is contained in:
Bert Wesarg 2010-12-09 21:47:57 +01:00 committed by Pat Thoyts
parent 963ceab57e
commit 6459d7c046
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/diff.tcl
View File

@ -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 {