Merge branch 'master' of git://repo.or.cz/git-gui

* 'master' of git://repo.or.cz/git-gui: (50 commits)
  git-gui: Minor refactoring of merge command line in merge support
  git-gui: Use more modern looking icons in the tree browser
  git-gui: Don't offer to stage hunks from untracked files
  git-gui: Make sure remotes are loaded when picking revisions
  git-gui: Use progress bar while resetting/aborting files
  git-gui: Honor core.excludesfile when listing extra files
  git-gui: Unify wording to say "to stage" instead of "to add"
  git-gui: Don't kill modified commit message buffer with merge templates
  git-gui: Remove usernames from absolute SSH urls during merging
  git-gui: Format tracking branch merges as though they were pulls
  git-gui: Cleanup bindings within merge dialog
  git-gui: Replace merge dialog with our revision picker widget
  git-gui: Show ref last update times in revision chooser tooltips
  git-gui: Display commit/tag/remote info in tooltip of revision picker
  git-gui: Save remote urls obtained from config/remotes setup
  git-gui: Avoid unnecessary symbolic-ref call during checkout
  git-gui: Refactor current branch menu items to make i18n easier
  git-gui: Refactor diff popup into a procedure to ease i18n work
  git-gui: Paper bag fix quitting crash after commit
  git-gui: Clarify meaning of add tracked menu option
  ...

git-gui/lib/remote.tcl

@@ -57,6 +57,7 @@ proc all_tracking_branches {} {
 proc load_all_remotes {} {
 	global repo_config
 	global all_remotes tracking_branches some_heads_tracking
+	global remote_url
 
 	set some_heads_tracking 0
 	set all_remotes [list]
@@ -76,6 +77,10 @@ proc load_all_remotes {} {
 			catch {
 				set fd [open [file join $rm_dir $name] r]
 				while {[gets $fd line] >= 0} {
+					if {[regexp {^URL:[ 	]*(.+)$} $line line url]} {
+						set remote_url($name) $url
+						continue
+					}
 					if {![regexp {^Pull:[ 	]*([^:]+):(.+)$} \
 						$line line src dst]} continue
 					if {[string index $src 0] eq {+}} {
@@ -100,6 +105,7 @@ proc load_all_remotes {} {
 	foreach line [array names repo_config remote.*.url] {
 		if {![regexp ^remote\.(.*)\.url\$ $line line name]} continue
 		lappend all_remotes $name
+		set remote_url($name) $repo_config(remote.$name.url)
 
 		if {[catch {set fl $repo_config(remote.$name.fetch)}]} {
 			set fl {}