diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-10-20 20:43:36 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-20 20:43:36 -0400 |
| commit | c9dcc7f865fb7891f4f6d068230663eb2cb586a7 (patch) | |
| tree | dda2dc1770bbc3115a4487f0b32e3323e899fd97 /lib/commit.tcl | |
| parent | git-gui: Paper bag fix the global config parsing (diff) | |
| parent | git-gui: Don't display CR within console windows (diff) | |
| download | tgif-c9dcc7f865fb7891f4f6d068230663eb2cb586a7.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Don't display CR within console windows
git-gui: Handle progress bars from newer gits
git-gui: Correctly report failures from git-write-tree
Conflicts:
lib/commit.tcl
lib/console.tcl
Diffstat (limited to 'lib/commit.tcl')
| -rw-r--r-- | lib/commit.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/commit.tcl b/lib/commit.tcl index 7099f5c6f7..10b0430f54 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -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 [strcat [mc "write-tree failed:"] "\n\n$err"] ui_status {Commit failed.} unlock_index |