summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLibravatar Jens Lehmann <Jens.Lehmann@web.de>2009-03-30 20:35:57 +0200
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2009-04-05 12:45:40 -0700
commitf0d4eec99f2367bad77ec46680d7b07d4472d230 (patch)
tree80173a322b0c2b0869c099b79e3b3bf5e8cee277 /lib
parentgit-gui: use `git --html-path` to get the location of installed HTML docs (diff)
downloadtgif-f0d4eec99f2367bad77ec46680d7b07d4472d230.tar.xz
git-gui: When calling post-commit hook wrong variable was cleared.
Before calling the post-commit hook, the variable "pc_err" is cleared while later only "pch_error" is used. "pch_error$cmt_id" only appeared in "upvar"-Statements (which were changed to "global") and was removed. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/commit.tcl6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/commit.tcl b/lib/commit.tcl
index 17aba914af..7f459cd564 100644
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -407,8 +407,8 @@ A rescan will be automatically started now.
#
set fd_ph [githook_read post-commit]
if {$fd_ph ne {}} {
- upvar #0 pch_error$cmt_id pc_err
- set pc_err {}
+ global pch_error
+ set pch_error {}
fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
fileevent $fd_ph readable \
[list commit_postcommit_wait $fd_ph $cmt_id]
@@ -470,7 +470,7 @@ A rescan will be automatically started now.
}
proc commit_postcommit_wait {fd_ph cmt_id} {
- upvar #0 pch_error$cmt_id pch_error
+ global pch_error
append pch_error [read $fd_ph]
fconfigure $fd_ph -blocking 1