diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 40a710355751836e78b65101592b753266f507ca..334514996a9e900d124b5fdc54f83dc9924517b5 100644 (file)
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
_? {continue}
A? -
D? -
_? {continue}
A? -
D? -
+ T_ -
M? {set files_ready 1}
M? {set files_ready 1}
+ _U -
U? {
error_popup [mc "Unmerged files cannot be committed.
U? {
error_popup [mc "Unmerged files cannot be committed.
}
}
}
}
}
}
- if {!$files_ready && ![string match *merge $curType]} {
+ if {!$files_ready && ![string match *merge $curType] && ![is_enabled nocommit]} {
info_popup [mc "No changes to commit.
You must stage at least 1 file before you can commit.
info_popup [mc "No changes to commit.
You must stage at least 1 file before you can commit.
return
}
return
}
+ if {[is_enabled nocommitmsg]} { do_quit 0 }
+
# -- A message is required.
#
set msg [string trim [$ui_comm get 1.0 end]]
# -- A message is required.
#
set msg [string trim [$ui_comm get 1.0 end]]
puts $msg_wt $msg
close $msg_wt
puts $msg_wt $msg
close $msg_wt
+ if {[is_enabled nocommit]} { do_quit 0 }
+
# -- Run the pre-commit hook.
#
set fd_ph [githook_read pre-commit]
# -- Run the pre-commit hook.
#
set fd_ph [githook_read pre-commit]
set ::GITGUI_BCK_exists 0
}
set ::GITGUI_BCK_exists 0
}
- if {[is_enabled singlecommit]} do_quit
+ if {[is_enabled singlecommit]} { do_quit 0 }
# -- Update in memory status
#
# -- Update in memory status
#
__ -
A_ -
M_ -
__ -
A_ -
M_ -
+ T_ -
D_ {
unset file_states($path)
catch {unset selected_paths($path)}
D_ {
unset file_states($path)
catch {unset selected_paths($path)}