diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-12-17 21:56:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-17 21:56:48 -0800 |
| commit | b4955fb611ce407ef0e522862c60ae0472dbfe5e (patch) | |
| tree | 1818fb0364fdd7473dfc4e7d0edaf93aa9286f82 /git-gui/lib/commit.tcl | |
| parent | 1df27132493171294d0d2b53bd75bb8e131eea2b (diff) | |
| parent | e612120d232a5ef04dcf22fc92741565ebb4d0c8 (diff) | |
| download | git-b4955fb611ce407ef0e522862c60ae0472dbfe5e.tar.gz git-b4955fb611ce407ef0e522862c60ae0472dbfe5e.tar.xz | |
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui:
git-gui 0.12
git-gui: Get rid of the last remnants of GIT_CONFIG_LOCAL
git-gui: Update Hungarian translation for 0.12
git-gui: Fixed typos in Swedish translation.
git-gui: Updated Swedish translation (515t0f0u).
git gui: update Italian translation
git-gui: Update Japanese translation for 0.12
git-gui: Starting translation for Norwegian
git-gui: Update German (completed) translation.
git-gui: Update po template to include 'Mirroring %s' message
git-gui: Fix commit encoding handling.
git-gui: Fix handling of relative paths in blame.
Diffstat (limited to 'git-gui/lib/commit.tcl')
| -rw-r--r-- | git-gui/lib/commit.tcl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index 334514996..9cc841059 100644 --- a/git-gui/lib/commit.tcl +++ b/git-gui/lib/commit.tcl @@ -27,9 +27,8 @@ You are currently in the middle of a merge that has not been fully completed. Y if {[catch { set fd [git_read cat-file commit $curHEAD] fconfigure $fd -encoding binary -translation lf - if {[catch {set enc $repo_config(i18n.commitencoding)}]} { - set enc utf-8 - } + # By default commits are assumed to be in utf-8 + set enc utf-8 while {[gets $fd line] > 0} { if {[string match {parent *} $line]} { lappend parents [string range $line 7 end] @@ -208,7 +207,7 @@ A good commit message has the following format: if {$use_enc ne {}} { fconfigure $msg_wt -encoding $use_enc } else { - puts stderr [mc "warning: Tcl does not support encoding '%s'." $enc] + error_popup [mc "warning: Tcl does not support encoding '%s'." $enc] fconfigure $msg_wt -encoding utf-8 } puts $msg_wt $msg |