X-Git-Url: https://git.tokkee.org/?p=git.git;a=blobdiff_plain;f=gitk;h=651b7400436c0a1eb4dfa029a9fee187060fc44d;hp=d067492066d134e437b838fdf093ef71a010310b;hb=b2b76d10696d945bf19318831b64d009d119e051;hpb=6febdede5acdbab192d955d4e0cd810f3fbee27f

diff --git a/gitk b/gitk
index d06749206..651b74004 100755
--- a/gitk
+++ b/gitk
@@ -7476,7 +7476,7 @@ proc addtocflist {ids} {
 }
 
 proc diffcmd {ids flags} {
-    global nullid nullid2
+    global log_showroot nullid nullid2
 
     set i [lsearch -exact $ids $nullid]
     set j [lsearch -exact $ids $nullid2]
@@ -7510,6 +7510,9 @@ proc diffcmd {ids flags} {
 	    lappend cmd HEAD
 	}
     } else {
+	if {$log_showroot} {
+	    lappend flags --root
+	}
 	set cmd [concat | git diff-tree -r $flags $ids]
     }
     return $cmd
@@ -11559,6 +11562,11 @@ catch {
     }
 }
 
+set log_showroot true
+catch {
+    set log_showroot [exec git config --bool --get log.showroot]
+}
+
 if {[tk windowingsystem] eq "aqua"} {
     set mainfont {{Lucida Grande} 9}
     set textfont {Monaco 9}