diff options
| author | Clemens Buchacher <drizzd@aon.at> | 2008-08-30 18:45:27 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-01 12:45:46 -0700 |
| commit | 55ba8a3474102eb8d638834d2b9bfe58d5014a40 (patch) | |
| tree | 288d84848a2e6444663896f5318a6de1774ea23c | |
| parent | f2816b3d34ef93553b14a5fe23c48d092a74901f (diff) | |
| download | git-55ba8a3474102eb8d638834d2b9bfe58d5014a40.tar.gz | |
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>
| -rwxr-xr-x | git-gui.sh | 2 | ||||
| -rw-r--r-- | lib/diff.tcl | 2 | ||||
| -rw-r--r-- | lib/option.tcl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/git-gui.sh b/git-gui.sh index ad65aaad5a..86402d49f7 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1932,7 +1932,7 @@ proc show_more_context {} { 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 } diff --git a/lib/diff.tcl b/lib/diff.tcl index 52b79e4a1f..4a7138be9c 100644 --- 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 - if {$repo_config(gui.diffcontext) >= 0} { + if {$repo_config(gui.diffcontext) >= 1} { lappend cmd "-U$repo_config(gui.diffcontext)" } if {$w eq $ui_index} { diff --git a/lib/option.tcl b/lib/option.tcl index ffb3f00ff0..5e1346e601 100644 --- 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"}} - {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"}} } { |