git-gui: Correctly report failures from git-write-tree
authorShawn O. Pearce <spearce@spearce.org>
Sat, 20 Oct 2007 05:42:01 +0000 (01:42 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Sat, 20 Oct 2007 05:42:01 +0000 (01:42 -0400)
If git-write-tree fails (such as if the index file is currently
locked and it wants to write to it) we were not getting the error
message as $tree_id was always the empty string so we shortcut
through the catch and never got the output from stderr.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
lib/commit.tcl

index f857a2ff5bb3d0e151ea471a16a1b233117afc70..57238129e420a313c34e2a99b9f9bdb87ecce39d 100644 (file)
@@ -253,7 +253,7 @@ proc commit_committree {fd_wt curHEAD msg} {
        global repo_config
 
        gets $fd_wt tree_id
-       if {$tree_id eq {} || [catch {close $fd_wt} err]} {
+       if {[catch {close $fd_wt} err]} {
                error_popup "write-tree failed:\n\n$err"
                ui_status {Commit failed.}
                unlock_index