Skip to content

Commit

Permalink
repo git: don't hang on large rebase outputs. Should fix hbons#663
Browse files Browse the repository at this point in the history
  • Loading branch information
hbons committed Mar 28, 2012
1 parent fb49ab9 commit 6d1b6ad
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions SparkleLib/Git/SparkleRepoGit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,6 @@ private void Commit (string message)
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 ();
}


Expand All @@ -419,7 +414,8 @@ private void Rebase ()
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 ();
Expand Down

0 comments on commit 6d1b6ad

Please sign in to comment.