From: Bert Wesarg Date: Thu, 09 Dec 2010 20:47:54 GMT Subject: [PATCH 3/8] git-gui: name also new symlinks so Message-ID: In-Reply-To: <56141ad4622dfc1ee991c9ee3be90dbf3e99b744.1291927657.git.bert.wesarg@googlemail.com> and rename them only in the diff header Signed-off-by: Bert Wesarg --- lib/diff.tcl | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/diff.tcl b/lib/diff.tcl index 0b72924..aa30089 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -406,12 +406,13 @@ proc read_diff {fd conflict_size cont_info} { || [string match {index *} $line]} { continue } - } - if {$line eq {deleted file mode 120000}} { - set line "deleted symlink" + # -- Name it symlink, not 120000 + # Note, that the original line is in $current_diff_header + regsub {^(deleted|new) file mode 120000} $line {\1 symlink} line } + # -- Automatically detect if this is a 3 way diff. # if {[string match {@@@ *} $line]} {set is_3way_diff 1} @@ -421,6 +422,7 @@ proc read_diff {fd conflict_size cont_info} { || [regexp {^(old|new) mode *} $line] || [string match {deleted file *} $line] || [string match {deleted symlink} $line] + || [string match {new symlink} $line] || [string match {Binary files * and * differ} $line] || $line eq {\ No newline at end of file} || [regexp {^\* Unmerged path } $line]} { -- 1.7.3.2.1200.ge4bf6