git-config-set: Properly terminate strings with '\0'

[git.git] / gitk

diff --git a/gitk b/gitk
index 5deab53..58b4abc 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -218,6 +218,8 @@ proc parsecommit {id contents listed olds} {
     set i [string first "\n" $comment]
     if {$i >= 0} {
        set headline [string trim [string range $comment 0 $i]]
+    } else {
+       set headline $comment
     }
     if {!$listed} {
        # git-rev-list indents the comment by 4 spaces;
@@ -226,6 +228,7 @@ proc parsecommit {id contents listed olds} {
        foreach line [split $comment "\n"] {
            append newcomment "    "
            append newcomment $line
+           append newcomment "\n"
        }
        set comment $newcomment
     }
@@ -1503,17 +1506,15 @@ proc drawrest {} {
     global numcommits ncmupdate
     global nextupdate startmsecs revlistorder
 
-    if {!$revlistorder} {
-       set level [decidenext]
-       if {$level >= 0} {
-           set phase drawgraph
-           while 1 {
-               lappend displayorder [lindex $todo $level]
-               set hard [updatetodo $level $datemode]
-               if {$hard} {
-                   set level [decidenext]
-                   if {$level < 0} break
-               }
+    set level [decidenext]
+    if {$level >= 0} {
+       set phase drawgraph
+       while 1 {
+           lappend displayorder [lindex $todo $level]
+           set hard [updatetodo $level $datemode]
+           if {$hard} {
+               set level [decidenext]
+               if {$level < 0} break
            }
        }
     }
@@ -2787,8 +2788,7 @@ proc gettreediffs {ids} {
     set treepending $ids
     set treediff {}
     set id [lindex $ids 0]
-    set p [lindex $ids 1]
-    if [catch {set gdtf [open "|git-diff-tree -r $id" r]}] return
+    if [catch {set gdtf [open "|git-diff-tree --no-commit-id -r $id" r]}] return
     fconfigure $gdtf -blocking 0
     fileevent $gdtf readable [list gettreediffline $gdtf $ids]
 }
@@ -2822,9 +2822,8 @@ proc getblobdiffs {ids} {
     global difffilestart nextupdate diffinhdr treediffs
 
     set id [lindex $ids 0]
-    set p [lindex $ids 1]
     set env(GIT_DIFF_OPTS) $diffopts
-    set cmd [list | git-diff-tree -r -p -C $id]
+    set cmd [list | git-diff-tree --no-commit-id -r -p -C $id]
     if {[catch {set bdf [open $cmd r]} err]} {
        puts "error getting diffs: $err"
        return
@@ -3160,7 +3159,7 @@ proc clickisonarrow {id y} {
 }
 
 proc arrowjump {id dirn y} {
-    global mainline sidelines canv
+    global mainline sidelines canv canv2 canv3
 
     set yt {}
     if {$dirn eq "down"} {
@@ -3198,6 +3197,8 @@ proc arrowjump {id dirn y} {
        set yfrac 0
     }
     $canv yview moveto $yfrac
+    $canv2 yview moveto $yfrac
+    $canv3 yview moveto $yfrac
 }
 
 proc lineclick {x y id isnew} {