[PATCH] git-gui: reload tracking branches after adding remote

[PATCH] git-gui: reload tracking branches after adding remote

[Tom Levy]

Hi,

git-gui does not display new tracking branches after adding a remote.

Steps to reproduce issue:

$ git init test_repo
$ cd test_repo
$ git commit --allow-empty -m "Initial commit"
$ git gui
Remote > Add... > Name: "test_remote", Location: ".". Add.
(Fetch output: [new branch] master -> test_remote/master. Close.)
Branch > Create... . Select "Tracking Branch".

Expected result: test_remote/master should be displayed.
Actual result: No tracking branches displayed.

A workaround is to close and re-open git-gui.

The patch below fixes the issue by reloading the tracking branches
after adding a remote (see the commit message for more details).

It may be a good idea to also reload the tracking branches when
removing a remote (something this patch doesn't do). It's not strictly
necessary with the way the code is currently written (see the commit
message).

Regards,
Tom Levy

-- >8 --

Subject: [PATCH] git-gui: reload tracking branches after adding remote

Otherwise newly-fetched tracking branches are not displayed in the
revision chooser's Tracking Branch tab ($tracking_branches is not
updated, so 'all_tracking_branches' does not return the new branches).

The reload is done using 'load_all_remotes', which also reloads
$all_remotes and $repo_config, so they don't need to be manually
updated any more.

When removing remotes, it's not necessary to reload the tracking
branches. This is because 'all_tracking_branches' is only called from
choose_rev.tcl, which filters out non-existent refs.

Signed-off-by: Tom Levy <tomlevy93@gmail.com>
---
 lib/remote.tcl | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/remote.tcl b/lib/remote.tcl
index ef77ed7..ed26170 100644
--- a/lib/remote.tcl
+++ b/lib/remote.tcl
@@ -285,15 +285,9 @@ proc populate_remotes_menu {} {
 }
 
 proc add_single_remote {name location} {
-	global all_remotes repo_config
-	lappend all_remotes $name
-
 	git remote add $name $location
 
-	# XXX: Better re-read the config so that we will never get out
-	# of sync with git remote implementation?
-	set repo_config(remote.$name.url) $location
-	set repo_config(remote.$name.fetch) "+refs/heads/*:refs/remotes/$name/*"
+	load_all_remotes
 
 	add_fetch_entry $name
 	add_push_entry $name
-- 
2.30.2