[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 <davvid@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:

committed by
Paul Mackerras

parent
8809d691ec
commit
cb8329aa9a
7
gitk
7
gitk
@ -403,6 +403,9 @@ proc readcommit {id} {
|
|||||||
proc updatecommits {} {
|
proc updatecommits {} {
|
||||||
global viewdata curview phase displayorder ordertok idpending
|
global viewdata curview phase displayorder ordertok idpending
|
||||||
global children commitrow selectedline thickerline showneartags
|
global children commitrow selectedline thickerline showneartags
|
||||||
|
global isworktree
|
||||||
|
|
||||||
|
set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
|
||||||
|
|
||||||
if {$phase ne {}} {
|
if {$phase ne {}} {
|
||||||
stop_rev_list
|
stop_rev_list
|
||||||
@ -2885,8 +2888,9 @@ proc dohidelocalchanges {} {
|
|||||||
# spawn off a process to do git diff-index --cached HEAD
|
# spawn off a process to do git diff-index --cached HEAD
|
||||||
proc dodiffindex {} {
|
proc dodiffindex {} {
|
||||||
global localirow localfrow lserial showlocalchanges
|
global localirow localfrow lserial showlocalchanges
|
||||||
|
global isworktree
|
||||||
|
|
||||||
if {!$showlocalchanges} return
|
if {!$showlocalchanges || !$isworktree} return
|
||||||
incr lserial
|
incr lserial
|
||||||
set localfrow -1
|
set localfrow -1
|
||||||
set localirow -1
|
set localirow -1
|
||||||
@ -8698,6 +8702,7 @@ set patchnum 0
|
|||||||
set localirow -1
|
set localirow -1
|
||||||
set localfrow -1
|
set localfrow -1
|
||||||
set lserial 0
|
set lserial 0
|
||||||
|
set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
|
||||||
setcoords
|
setcoords
|
||||||
makewindow
|
makewindow
|
||||||
# wait for the window to become visible
|
# wait for the window to become visible
|
||||||
|
Reference in New Issue
Block a user