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

git-gui: use existing interface to query a path's attribute

Browse Source 
Replace the hand-coded call to git check-attr with the already provided one.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
This commit is contained in:
Bert Wesarg 2019-09-30 21:54:52 +02:00 committed by Pratyush Yadav
parent 60c60b627e
commit c3b57dc2a0
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/diff.tcl
View File

@ -270,19 +270,6 @@ proc show_other_diff {path w m cont_info} {
} }
} }
proc get_conflict_marker_size {path} {
set size 7
catch {
set fd_rc [eval [list git_read check-attr "conflict-marker-size" -- $path]]
set ret [gets $fd_rc line]
close $fd_rc
if {$ret > 0} {
regexp {.*: conflict-marker-size: (\d+)$} $line line size
}
}
return $size
}
proc start_show_diff {cont_info {add_opts {}}} { proc start_show_diff {cont_info {add_opts {}}} {
global file_states file_lists global file_states file_lists
global is_3way_diff is_submodule_diff diff_active repo_config global is_3way_diff is_submodule_diff diff_active repo_config
@ -298,7 +285,7 @@ proc start_show_diff {cont_info {add_opts {}}} {
set is_submodule_diff 0 set is_submodule_diff 0
set diff_active 1 set diff_active 1
set current_diff_header {} set current_diff_header {}
set conflict_size [get_conflict_marker_size $path] set conflict_size [gitattr $path conflict-marker-size 7]
set cmd [list] set cmd [list]
if {$w eq $ui_index} { if {$w eq $ui_index} {