git-gui: Move commit_prehook into commit_tree.

The only reason the commit_prehook logic was broken out into its own
proc was so it could be invoked after the current set of files that
were already added to the commit could be refreshed if 'Allow Partially
Added Files' was set to false.  Now that we no longer even offer that
option to the user there is no reason to keep this code broken out
into its own procedure.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui.sh b/git-gui.sh
index e82eb6bbe55d21742363d9c9db6f9b45ca87a62d..e4676bf7950ab86452a435cdf26710ea7e32b3c7 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -825,6 +825,7 @@ proc committer_ident {} {
 
 proc commit_tree {} {
        global HEAD commit_type file_states ui_comm repo_config
 
 proc commit_tree {} {
        global HEAD commit_type file_states ui_comm repo_config

+       global ui_status_value pch_error

 
        if {![lock_index update]} return
        if {[committer_ident] eq {}} return
 
        if {![lock_index update]} return
        if {[committer_ident] eq {}} return


@@ -900,12 +901,8 @@ A good commit message has the following format:
                return
        }
 
                return
        }
 

-       commit_prehook $curHEAD $msg
-}
-
-proc commit_prehook {curHEAD msg} {
-       global ui_status_value pch_error
-
+       # -- Run the pre-commit hook.
+       #

        set pchook [gitdir hooks pre-commit]
 
        # On Cygwin [file executable] might lie so we need to ask
        set pchook [gitdir hooks pre-commit]
 
        # On Cygwin [file executable] might lie so we need to ask