Skip to content

Commit

Permalink
git gui: show diffs with a minimum of 1 context line
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Clemens Buchacher authored and Shawn O. Pearce committed Sep 1, 2008
1 parent f2816b3 commit 55ba8a3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion git-gui.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion lib/diff.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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} {
Expand Down
2 changes: 1 addition & 1 deletion lib/option.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
} {
Expand Down

0 comments on commit 55ba8a3

Please sign in to comment.