From 6d1b6adbf8fa9fbb101d8c876ff3addf652029d9 Mon Sep 17 00:00:00 2001 From: Hylke Bons Date: Wed, 28 Mar 2012 23:11:41 +0100 Subject: [PATCH] repo git: don't hang on large rebase outputs. Should fix #663 --- SparkleLib/Git/SparkleRepoGit.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/SparkleLib/Git/SparkleRepoGit.cs b/SparkleLib/Git/SparkleRepoGit.cs index 7c562096..43188491 100644 --- a/SparkleLib/Git/SparkleRepoGit.cs +++ b/SparkleLib/Git/SparkleRepoGit.cs @@ -399,11 +399,6 @@ namespace SparkleLib.Git { git.WaitForExit (); SparkleHelpers.DebugInfo ("Commit", "[" + Name + "] " + message); - - // Collect garbage pseudo-randomly. Turn off for - // now: too resource heavy. - // if (DateTime.Now.Second % 10 == 0) - // CollectGarbage (); } @@ -419,7 +414,8 @@ namespace SparkleLib.Git { Commit (commit_message); } - SparkleGit git = new SparkleGit (LocalPath, "rebase -v FETCH_HEAD"); + SparkleGit git = new SparkleGit (LocalPath, "rebase FETCH_HEAD"); + git.StartInfo.RedirectStandardOutput = false; git.Start (); git.WaitForExit ();