From: Paul Mackerras <paulus@samba.org>
Date: Sat, 15 Sep 2007 02:08:38 +0000 (+1000)
Subject: gitk: Fix bug in generating patches
X-Git-Tag: v1.5.4-rc0~318^2~1^2~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d372e21613b36d94d595f6627ec603ed11e2fd65;p=git.git

gitk: Fix bug in generating patches

Commit 8f4893639129acfc866c71583317090aa2a46eab changed mkpatchgo
to use diffcmd rather than constructing the diff command itself.
Unfortunately diffcmd returns the command with a "|" as the first
element (ready for use with open), but exec won't accept the "|".
Thus we need to remove the "|".

Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index 85d33abf4..d5db83652 100755
--- a/gitk
+++ b/gitk
@@ -5920,6 +5920,8 @@ proc mkpatchgo {} {
     set newid [$patchtop.tosha1 get]
     set fname [$patchtop.fname get]
     set cmd [diffcmd [list $oldid $newid] -p]
+    # trim off the initial "|"
+    set cmd [lrange $cmd 1 end]
     lappend cmd >$fname &
     if {[catch {eval exec $cmd} err]} {
 	error_popup "Error creating patch: $err"