diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-02-21 09:33:59 +0300 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-02-21 09:33:59 +0300 |
| commit | 981193786fc30b9ee73b9f223a75642b4ed455b9 (patch) | |
| tree | 6bc4da1ba5e542f5887e96d8ae3c516cac26c246 | |
| parent | 7391b2e9991e138786a2ac049ce7f276f7abce40 (diff) | |
git-gui: Don't crash in citool mode on initial commit.gitgui-0.6.1
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>
| -rwxr-xr-x | git-gui.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/git-gui.sh b/git-gui.sh index 039e7bb93f..f84ba3382b 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1318,14 +1318,6 @@ proc commit_committree {fd_wt curHEAD msg} { 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} @@ -1361,6 +1353,14 @@ proc commit_committree {fd_wt curHEAD msg} { 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 |