[PATCH 8/8] gitk: show modified files with separate work tree
"git rev-parse --is-inside-work-tree" is currently used to determine whether to show modified files in gitk (the red and green fake commits). This does not work if the current directory is not inside the work tree, as can be the case e.g. if GIT_WORK_TREE is set. Instead, check if the repository is not bare and that we are not inside the .git directory.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
--- Is the test in proc hasworktree good?
Why do git commands that need a work tree not work under .git? Why don't they show the same output as if they had been run from the work tree? (Btw, the check for valid work tree does not work for aliases, so e.g. 'git st', with 'st' as alias for 'status' will show all files as deleted.)
How do I simplify the Tcl code to just return the boolean right away?
Why is the hasworktree variable reset in updatecommits? The only reason I can think of is when 'core.worktree' is set/changed, but I don't think that case worked very well before this series anyway. Should gitdir also be recalculated?
gitk-git/gitk | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
Show changes to gitk-git/gitk +15 −6
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 232ea6e..914de8d 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -9,6 +9,15 @@ exec wish "$0" -- "$@"
package require Tk
+proc hasworktree {} {
+ if {[expr {[exec git rev-parse --is-bare-repository] == "false"}] &&
+ [expr {[exec git rev-parse --is-inside-git-dir] == "false"}]} {
+ return 1
+ } else {
+ return 0
+ }
+}
+
# A simple scheduler for compute-intensive stuff.
# The aim is to make sure that event handlers for GUI actions can
# run at least every 50-100 ms. Unfortunately fileevent handlers are
@@ -459,11 +468,11 @@ proc updatecommits {} {
global viewactive viewcomplete tclencoding
global startmsecs showneartags showlocalchanges
global mainheadid viewmainheadid viewmainheadid_orig pending_select
- global isworktree
+ global hasworktree
global varcid vposids vnegids vflags vrevs
global show_notes
- set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
+ set hasworktree [hasworktree]
rereadrefs
set view $curview
if {$mainheadid ne $viewmainheadid_orig($view)} {
@@ -5025,9 +5034,9 @@ proc dohidelocalchanges {} {
# spawn off a process to do git diff-index --cached HEAD
proc dodiffindex {} {
global lserial showlocalchanges vfilelimit curview
- global isworktree
+ global hasworktree
- if {!$showlocalchanges || !$isworktree} return
+ if {!$showlocalchanges || !$hasworktree} return
incr lserial
set cmd "|git diff-index --cached HEAD"
if {$vfilelimit($curview) ne {}} {
@@ -11617,9 +11626,9 @@ set stopped 0
set stuffsaved 0
set patchnum 0
set lserial 0
-set isworktree [expr {[exec git rev-parse --is-inside-work-tree] == "true"}]
+set hasworktree [hasworktree]
set cdup {}
-if {$isworktree} {
+if {[expr {[exec git rev-parse --is-inside-work-tree] == "true"}]} {
set cdup [exec git rev-parse --show-cdup]
}
set worktree [exec git rev-parse --show-toplevel]
--
1.7.4.79.gcbe20
Martin von Zweigbergk
