diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-02-08 15:59:39 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-02-08 15:59:39 -0500 |
| commit | 63faf4df6e174cc1e33a759d49133044c732ea32 (patch) | |
| tree | d868c9e02971ccfc4fd42945652925d8b8b67b8b | |
| parent | 37f1db80a46cf753308bfc9b5de9dd3b3a551218 (diff) | |
| download | git-63faf4df6e174cc1e33a759d49133044c732ea32.tar.gz git-63faf4df6e174cc1e33a759d49133044c732ea32.tar.xz | |
git-gui: Update known branches during rescan.
If the user has created (or deleted) a branch through an external tool,
and uses Rescan, they probably are trying to make git-gui update to show
their newly created branch.
So now we load all known heads and update the branch menu during any
rescan operation, just in-case the set of known branches was modified.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
| -rwxr-xr-x | git-gui.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh index ef353319e..4116821d8 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -400,7 +400,7 @@ proc rescan {after {honor_trustmtime 1}} { global HEAD PARENT MERGE_HEAD commit_type global ui_index ui_workdir ui_status_value ui_comm global rescan_active file_states - global repo_config + global repo_config single_commit if {$rescan_active > 0 || ![lock_index read]} return @@ -427,6 +427,11 @@ proc rescan {after {honor_trustmtime 1}} { $ui_comm edit modified false } + if {!$single_commit} { + load_all_heads + populate_branch_menu + } + if {$honor_trustmtime && $repo_config(gui.trustmtime) eq {true}} { rescan_stage2 {} $after } else { |