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

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>

diff --git a/git-gui.sh b/git-gui.sh
index ad65aaad5a696ec355d9b965b13704f57145678f..86402d49f72c56d793f2f1958a9e3d3f8300f367 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1932,7 +1932,7 @@ proc show_more_context {} {
 
 proc show_less_context {} {
        global repo_config
 
 proc show_less_context {} {
        global repo_config

-       if {$repo_config(gui.diffcontext) >= 1} {
+       if {$repo_config(gui.diffcontext) > 1} {

                incr repo_config(gui.diffcontext) -1
                reshow_diff
        }
                incr repo_config(gui.diffcontext) -1
                reshow_diff
        }

diff --git a/lib/diff.tcl b/lib/diff.tcl
index 52b79e4a1f476c2ee9b65087f66a352a25ed0903..4a7138be9c0a860d7b4a9820a6d796fa3cabc700 100644 (file)
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -175,7 +175,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}}} {
 
        lappend cmd -p
        lappend cmd --no-color
 
        lappend cmd -p
        lappend cmd --no-color

-       if {$repo_config(gui.diffcontext) >= 0} {
+       if {$repo_config(gui.diffcontext) >= 1} {

                lappend cmd "-U$repo_config(gui.diffcontext)"
        }
        if {$w eq $ui_index} {
                lappend cmd "-U$repo_config(gui.diffcontext)"
        }
        if {$w eq $ui_index} {

diff --git a/lib/option.tcl b/lib/option.tcl
index ffb3f00ff0a992254804cc047b5a63ce82aa5bd9..5e1346e601faf90114e9c62f11144f812835e872 100644 (file)
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -125,7 +125,7 @@ proc do_options {} {
                {b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
                {b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}}
                {i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
                {b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
                {b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}}
                {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"}}
                {t gui.newbranchtemplate {mc "New Branch Name Template"}}
                } {
                {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
                {t gui.newbranchtemplate {mc "New Branch Name Template"}}
                } {