[PATCH 1/2] git-gui: make config gui.warndetachedcommit a boolean
Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
---
lib/commit.tcl | 2 +-
lib/option.tcl | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/lib/commit.tcl b/lib/commit.tcl
index 372bed9..e27e148 100644
--- 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
- 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\
diff --git a/lib/option.tcl b/lib/option.tcl
index 719103a..f7f866b 100644
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -156,6 +156,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"}}
+ {b gui.warndetachedcommit {mc "Warn before commiting to a detached head"}}
{s gui.stageuntracked {mc "Staging of untracked files"} {list "yes" "no" "ask"}}
} {
set type [lindex $option 0]
--
1.7.7.908.g383b5
Bert Wesarg <bert.wesarg@googlemail.com>