Merge pull request #503 from RaphHaddad/issue-367

Issue #367 fix

Author: JakeGinnivan

GitVersionCore/GitPreparer.cs

@@ -43,6 +43,7 @@ public void Initialise(bool normaliseGitDirectory)
             }
 
             var targetPath = CalculateTemporaryRepositoryPath(targetUrl, dynamicRepositoryLocation);
+
             DynamicGitRepositoryPath = CreateDynamicRepository(targetPath, authentication, targetUrl, targetBranch, noFetch);
             if (normaliseGitDirectory)
             {
@@ -119,6 +120,10 @@ static string CreateDynamicRepository(string targetPath, Authentication authenti
                 Logger.WriteInfo(string.Format("Updating branch '{0}'", targetBranch));
                 using (var repo = new Repository(targetPath))
                 {
+                    if (string.IsNullOrWhiteSpace(targetBranch))
+                    {
+                        throw new Exception("Dynamic Git repositories must have a target branch (/b)");
+                    }
                     var targetGitBranch = repo.Branches[targetBranch];
                     var trackedBranch = targetGitBranch.TrackedBranch;
                     if (trackedBranch == null)

GitVersionCore/GitVersionCore.csproj

@@ -138,7 +138,6 @@
     <Compile Include="LambdaEqualityHelper.cs" />
     <Compile Include="LibGitExtensions.cs" />
     <Compile Include="Logger.cs" />
-    <Compile Include="MissingBranchException.cs" />
     <Compile Include="OutputFormatters\BuildOutputFormatter.cs" />
     <Compile Include="OutputFormatters\JsonOutputFormatter.cs" />
     <Compile Include="OutputType.cs" />

GitVersionCore/MissingBranchException.cs

@@ -242,5 +242,38 @@ public void UsingDynamicRepositoryWithFeatureBranchWorks()
         }
     }
 
+    [Test]
+    public void UsingDynamicRepositoryWithoutTargetBranchFails()
+    {
+        var repoName = Guid.NewGuid().ToString();
+        var tempPath = Path.GetTempPath();
+        var tempDir = Path.Combine(tempPath, repoName);
+        Directory.CreateDirectory(tempDir);
+
+        try
+        {
+            using (var mainRepositoryFixture = new EmptyRepositoryFixture(new Config()))
+            {
+                var commitId = mainRepositoryFixture.Repository.MakeACommit().Id.Sha;
+
+                var arguments = new Arguments
+                {
+                    TargetPath = tempDir,
+                    TargetUrl = mainRepositoryFixture.RepositoryPath,
+                    CommitId = commitId
+                };
+
+                var gitPreparer = new GitPreparer(arguments.TargetUrl, arguments.DynamicRepositoryLocation, arguments.Authentication, arguments.TargetBranch, arguments.NoFetch, arguments.TargetPath);
+                gitPreparer.Initialise(true);
+
+                Assert.Throws<Exception>(() => gitPreparer.Initialise(true));
+            }
+        }
+        finally
+        {
+            Directory.Delete(tempDir, true);
+        }
+    }
+
     // TODO test around normalisation
-}
+}