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

[PATCH] gitk: Heed the lines of context in merge commits

Browse Source 
There is an edit box where the number of context lines can be chosen.
But it was only used when regular diffs were displayed, not for
merge commits.   This fixes it.

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Johannes Sixt 2008-02-13 17:27:30 +01:00 committed by Paul Mackerras
parent 1407ade93c
commit 6675ea4240
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gitk
View File

@ -5032,13 +5032,14 @@ proc getblobline {bf id} {
proc mergediff {id l} { proc mergediff {id l} {
global diffmergeid mdifffd global diffmergeid mdifffd
global diffids global diffids
global diffcontext
global parentlist global parentlist
global limitdiffs viewfiles curview global limitdiffs viewfiles curview
set diffmergeid $id set diffmergeid $id
set diffids $id set diffids $id
# this doesn't seem to actually affect anything... # this doesn't seem to actually affect anything...
set cmd [concat | git diff-tree --no-commit-id --cc $id] set cmd [concat | git diff-tree --no-commit-id --cc -U$diffcontext $id]
if {$limitdiffs && $viewfiles($curview) ne {}} { if {$limitdiffs && $viewfiles($curview) ne {}} {
set cmd [concat $cmd -- $viewfiles($curview)] set cmd [concat $cmd -- $viewfiles($curview)]
} }