From 284234514fbe398bf11096e9263f62008afc6890 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Mon, 17 Sep 2012 11:22:42 +0100
Subject: [PATCH] repo git: set remote.origin.url from config.xml on startup.
 #972

---
 SparkleLib/Git/SparkleRepoGit.cs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs
index fc772471..afbf8548 100644
--- a/SparkleLib/Git/SparkleRepoGit.cs
+++ b/SparkleLib/Git/SparkleRepoGit.cs
@@ -28,18 +28,19 @@ namespace SparkleLib.Git {
     public class SparkleRepo : SparkleRepoBase {
 
 		private bool user_is_set;
-        private bool remote_url_is_set;
         private bool use_git_bin;
 
 
         public SparkleRepo (string path, SparkleConfig config) : base (path, config)
         {
             SparkleGit git = new SparkleGit (LocalPath, "config --get filter.bin.clean");
-            git.Start ();
-            git.WaitForExit ();
-            
+            git.StartAndWaitForExit ();
+
             this.use_git_bin = (git.ExitCode == 0);
 
+            git = new SparkleGit (LocalPath, "config remote.origin.url \"" + RemoteUrl + "\"");
+            git.StartAndWaitForExit ();
+
             string rebase_apply_path = new string [] { LocalPath, ".git", "rebase-apply" }.Combine ();
 
             if (Directory.Exists (rebase_apply_path)) {
@@ -178,13 +179,6 @@ namespace SparkleLib.Git {
             SparkleGit git;
 
             if (this.use_git_bin) {
-                if (this.remote_url_is_set) {
-                    git = new SparkleGit (LocalPath, "config remote.origin.url \"" + RemoteUrl + "\"");
-                    git.StartAndWaitForExit ();
-
-                    this.remote_url_is_set = true;
-                }
-
                 SparkleGitBin git_bin = new SparkleGitBin (LocalPath, "push");
                 git_bin.StartAndWaitForExit ();