From d8d166bf0950889743695174e55ea9201e9db9cd Mon Sep 17 00:00:00 2001 From: Bert Wesarg Date: Sat, 22 Oct 2011 21:39:40 +0200 Subject: [PATCH] git-gui: don't warn for detached head when rebasing Signed-off-by: Bert Wesarg Signed-off-by: Pat Thoyts --- lib/commit.tcl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/commit.tcl b/lib/commit.tcl index e27e148..0d81432 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -263,7 +263,9 @@ proc commit_commitmsg {curHEAD msg_p} { global is_detached repo_config global pch_error - if {$is_detached && [is_config_true gui.warndetachedcommit]} { + if {$is_detached + && ![file exists [gitdir rebase-merge head-name]] + && [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\ -- 2.11.4.GIT