mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: name also new symlinks so

Browse Source 
and rename them only in the diff header

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:54 +01:00
committed by Pat Thoyts
parent ebd143ff99
commit 97b8ee1671
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/diff.tcl
View File

@ -406,11 +406,12 @@ proc read_diff {fd conflict_size cont_info} {
|| [string match {index *} $line]} { || [string match {index *} $line]} {
continue continue
} }
# -- 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
} }
if {$line eq {deleted file mode 120000}} {
set line "deleted symlink"
}
# -- Automatically detect if this is a 3 way diff. # -- Automatically detect if this is a 3 way diff.
# #
@ -421,6 +422,7 @@ proc read_diff {fd conflict_size cont_info} {
|| [regexp {^(old|new) mode *} $line] || [regexp {^(old|new) mode *} $line]
|| [string match {deleted file *} $line] || [string match {deleted file *} $line]
|| [string match {deleted symlink} $line] || [string match {deleted symlink} $line]
|| [string match {new symlink} $line]
|| [string match {Binary files * and * differ} $line] || [string match {Binary files * and * differ} $line]
|| $line eq {\ No newline at end of file} || $line eq {\ No newline at end of file}
|| [regexp {^\* Unmerged path } $line]} { || [regexp {^\* Unmerged path } $line]} {