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

git gui: show diffs with a minimum of 1 context line

Browse Source 
Staging hunks without context does not work, because line number
information would have to be recomputed for individual hunks.

Since it is already possible to stage individual lines using
'Stage Line for Commit', zero context diffs are not really
necessary for git gui.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Clemens Buchacher
2008-08-30 18:45:27 +02:00
committed by Shawn O. Pearce
parent f2816b3d34
commit 55ba8a3474
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-gui.sh
View File

@ -1932,7 +1932,7 @@ proc show_more_context {} {
proc show_less_context {} { proc show_less_context {} {
global repo_config global repo_config
if {$repo_config(gui.diffcontext) >= 1} { if {$repo_config(gui.diffcontext) > 1} {
incr repo_config(gui.diffcontext) -1 incr repo_config(gui.diffcontext) -1
reshow_diff reshow_diff
} }

2
lib/diff.tcl
View File

@ -175,7 +175,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}}} {
lappend cmd -p lappend cmd -p
lappend cmd --no-color lappend cmd --no-color
if {$repo_config(gui.diffcontext) >= 0} { if {$repo_config(gui.diffcontext) >= 1} {
lappend cmd "-U$repo_config(gui.diffcontext)" lappend cmd "-U$repo_config(gui.diffcontext)"
} }
if {$w eq $ui_index} { if {$w eq $ui_index} {

2
lib/option.tcl
View File

@ -125,7 +125,7 @@ proc do_options {} {
{b gui.matchtrackingbranch {mc "Match Tracking Branches"}} {b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
{b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}} {b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}}
{i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}} {i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
{i-0..99 gui.diffcontext {mc "Number of Diff Context Lines"}} {i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
{i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}} {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
{t gui.newbranchtemplate {mc "New Branch Name Template"}} {t gui.newbranchtemplate {mc "New Branch Name Template"}}
} { } {