git: Prefer remote SparkleShare branch if it exists
This commit is contained in:
parent
1e79d8c89b
commit
4018bfc19c
|
@ -233,8 +233,18 @@ namespace Sparkles.Git {
|
||||||
public override void Complete ()
|
public override void Complete ()
|
||||||
{
|
{
|
||||||
if (!IsFetchedRepoEmpty) {
|
if (!IsFetchedRepoEmpty) {
|
||||||
GitCommand git = new GitCommand (TargetFolder, "checkout --quiet HEAD");
|
string branch = "HEAD";
|
||||||
git.StartAndWaitForExit ();
|
string prefered_branch = "SparkleShare";
|
||||||
|
|
||||||
|
// Prefer the "SparkleShare" branch if it exists
|
||||||
|
var git_show_ref = new GitCommand (TargetFolder, "show-ref --verify --quiet refs/heads/" + prefered_branch);
|
||||||
|
git_show_ref.StartAndWaitForExit ();
|
||||||
|
|
||||||
|
if (git_show_ref.ExitCode == 0)
|
||||||
|
branch = prefered_branch;
|
||||||
|
|
||||||
|
var git_checkout = new GitCommand (TargetFolder, "checkout --quiet " + branch);
|
||||||
|
git_checkout.StartAndWaitForExit ();
|
||||||
}
|
}
|
||||||
|
|
||||||
base.Complete ();
|
base.Complete ();
|
||||||
|
|
Loading…
Reference in a new issue