summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c5a1eb8)
raw | patch | inline | side by side (parent: c5a1eb8)
author | Shawn O. Pearce <spearce@spearce.org> | |
Sun, 21 Jan 2007 23:00:03 +0000 (18:00 -0500) | ||
committer | Shawn O. Pearce <spearce@spearce.org> | |
Mon, 22 Jan 2007 03:47:59 +0000 (22:47 -0500) |
If we are making an initial commit our branch head did not exist when
we scanned for all heads during startup. Consequently we won't have
it in our branch menu. So force it to be put there after the ref was
created.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
we scanned for all heads during startup. Consequently we won't have
it in our branch menu. So force it to be put there after the ref was
created.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-gui.sh | patch | blob | history |
diff --git a/git-gui.sh b/git-gui.sh
index 7115cb5d0559972d152c53b39bfabc2aca5369ad..d71fcd8220de8ad3e6125aeb63d504b7a4324a86 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
proc commit_committree {fd_wt curHEAD msg} {
global HEAD PARENT MERGE_HEAD commit_type
- global single_commit
+ global single_commit all_heads current_branch
global ui_status_value ui_comm selected_commit_type
global file_states selected_paths rescan_active
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 [gitdir MERGE_HEAD]}