git-gui: make config gui.warndetachedcommit a boolean

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

diff --git a/lib/commit.tcl b/lib/commit.tcl
index 372bed9948390483d66036231fce2fe8964d7bb6..e27e148803906d867844c3adf5fd6e7b6544027c 100644 (file)
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -263,7 +263,7 @@ proc commit_commitmsg {curHEAD msg_p} {
        global is_detached repo_config
        global pch_error
 
        global is_detached repo_config
        global pch_error
 

-       if {$is_detached && $repo_config(gui.warndetachedcommit)} {
+       if {$is_detached && [is_config_true gui.warndetachedcommit]} {

                set msg [mc "You are about to commit on a detached head.\
 This is a potentially dangerous thing to do because if you switch\
 to another branch you will loose your changes and it can be difficult\
                set msg [mc "You are about to commit on a detached head.\
 This is a potentially dangerous thing to do because if you switch\
 to another branch you will loose your changes and it can be difficult\

diff --git a/lib/option.tcl b/lib/option.tcl
index fb0677675ad7eddc4187cc00d0e8e039050b80e2..0cf1da1d7ebe75fe91322d9b404dbf4bd8a3b00f 100644 (file)
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -157,6 +157,7 @@ proc do_options {} {
                {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
                {t gui.newbranchtemplate {mc "New Branch Name Template"}}
                {c gui.encoding {mc "Default File Contents Encoding"}}
                {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
                {t gui.newbranchtemplate {mc "New Branch Name Template"}}
                {c gui.encoding {mc "Default File Contents Encoding"}}

+               {b gui.warndetachedcommit {mc "Warn before committing to a detached head"}}

                {s gui.stageuntracked {mc "Staging of untracked files"} {list "yes" "no" "ask"}}
                } {
                set type [lindex $option 0]
                {s gui.stageuntracked {mc "Staging of untracked files"} {list "yes" "no" "ask"}}
                } {
                set type [lindex $option 0]