From: David Aguilar Date: Mon, 10 Mar 2008 10:54:56 +0000 (-0700) Subject: [PATCH] gitk: Don't show local changes when we there is no work tree X-Git-Url: http://privyetmir.co.uk/gitweb?a=commitdiff_plain;h=cb8329aa9a6cc2e009d552b1180ce107cec4eb9d;p=gitk [PATCH] gitk: Don't show local changes when we there is no work tree Launching gitk on a bare repository or a .git directory would previously show the work tree as having removed all files. We now inhibit showing local changes when gitk is not launched from within a work tree. Signed-off-by: David Aguilar Signed-off-by: Paul Mackerras --- diff --git a/gitk b/gitk index 5a78a91..5d9f589 100755 --- a/gitk +++ b/gitk @@ -403,6 +403,9 @@ proc readcommit {id} { proc updatecommits {} { global viewdata curview phase displayorder ordertok idpending global children commitrow selectedline thickerline showneartags + global isworktree + + set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}] if {$phase ne {}} { stop_rev_list @@ -2885,8 +2888,9 @@ proc dohidelocalchanges {} { # spawn off a process to do git diff-index --cached HEAD proc dodiffindex {} { global localirow localfrow lserial showlocalchanges + global isworktree - if {!$showlocalchanges} return + if {!$showlocalchanges || !$isworktree} return incr lserial set localfrow -1 set localirow -1 @@ -8698,6 +8702,7 @@ set patchnum 0 set localirow -1 set localfrow -1 set lserial 0 +set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}] setcoords makewindow # wait for the window to become visible