git-gui: Don't crash in citool mode on initial commit.

Attempting to use `git citool` to create an initial commit caused
git-gui to crash with a Tcl error as it tried to add the newly
born branch to the non-existant branch menu.  Moving this code
to after the normal commit cleanup logic resolves the issue, as
we only have a branch menu if we are not in singlecommit mode.

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

diff --git a/git-gui.sh b/git-gui.sh
index 039e7bb93f554f55ea02ac58c306e403510176b5..f84ba3382b3078ee6de45bddfacd650973068303 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1318,14 +1318,6 @@ proc commit_committree {fd_wt curHEAD msg} {
                return
        }
 
                return
        }
 

-       # -- Make sure our current branch exists.
-       #
-       if {$commit_type eq {initial}} {
-               lappend all_heads $current_branch
-               set all_heads [lsort -unique $all_heads]
-               populate_branch_menu
-       }
-

        # -- Cleanup after ourselves.
        #
        catch {file delete $msg_p}
        # -- Cleanup after ourselves.
        #
        catch {file delete $msg_p}


@@ -1361,6 +1353,14 @@ proc commit_committree {fd_wt curHEAD msg} {
 
        if {[is_enabled singlecommit]} do_quit
 
 
        if {[is_enabled singlecommit]} do_quit
 

+       # -- Make sure our current branch exists.
+       #
+       if {$commit_type eq {initial}} {
+               lappend all_heads $current_branch
+               set all_heads [lsort -unique $all_heads]
+               populate_branch_menu
+       }
+

        # -- Update in memory status
        #
        set selected_commit_type new
        # -- Update in memory status
        #
        set selected_commit_type new