beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

repo git: always use the default repo branch, even if it's not master

Browse source
This commit is contained in:
Hylke Bons 2012-11-12 22:47:40 +00:00
parent a804a7139a
commit 94c1354a70
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
SparkleLib/Git/SparkleRepoGit.cs
View file

@ -32,6 +32,27 @@ namespace SparkleLib.Git {
private bool use_git_bin;
private bool is_encrypted;
private string cached_branch;
private string branch {
get {
if (string.IsNullOrEmpty (this.cached_branch)) {
string rebase_apply_path = new string [] { LocalPath, ".git", "rebase-apply" }.Combine ();
SparkleGit git;
if (Directory.Exists (rebase_apply_path)) {
git = new SparkleGit (LocalPath, "rebase --abort");
git.StartAndWaitForExit ();
}
git = new SparkleGit (LocalPath, "rev-parse --abbrev-ref HEAD");
this.cached_branch = git.StartAndReadStandardOutput ();
}
return this.cached_branch;
}
}
public SparkleRepo (string path, SparkleConfig config) : base (path, config)
{
@ -49,13 +70,6 @@ namespace SparkleLib.Git {
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)) {
git = new SparkleGit (LocalPath, "rebase --abort");
git.StartAndWaitForExit ();
}
string password_file_path = Path.Combine (LocalPath, ".git", "password");
if (File.Exists (password_file_path))
@ -158,7 +172,7 @@ namespace SparkleLib.Git {
SparkleLogger.LogInfo ("Git", Name + " | Checking for remote changes...");
string current_revision = CurrentRevision;
SparkleGit git = new SparkleGit (LocalPath, "ls-remote --heads --exit-code \"" + RemoteUrl + "\" master");
SparkleGit git = new SparkleGit (LocalPath, "ls-remote --heads --exit-code \"" + RemoteUrl + "\" " + this.branch);
string output = git.StartAndReadStandardOutput ();
if (git.ExitCode != 0)
@ -199,7 +213,7 @@ namespace SparkleLib.Git {
// TODO: Progress
}
git = new SparkleGit (LocalPath, "push --progress \"" + RemoteUrl + "\" master");
git = new SparkleGit (LocalPath, "push --progress \"" + RemoteUrl + "\" " + this.branch);
git.StartInfo.RedirectStandardError = true;
git.Start ();
@ -281,7 +295,7 @@ namespace SparkleLib.Git {
public override bool SyncDown ()
{
SparkleGit git = new SparkleGit (LocalPath, "fetch --progress \"" + RemoteUrl + "\" master");
SparkleGit git = new SparkleGit (LocalPath, "fetch --progress \"" + RemoteUrl + "\" " + this.branch);
git.StartInfo.RedirectStandardError = true;
git.Start ();