Mirror_Repos/git-tfs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #324 from git-tfs/fix-rcheckin-ignores-no-build-default-comment

Browse Source 
Fix: Rcheckin ignores --no-build-default-comment option
This commit is contained in:
Matt Burke
2013-03-21 14:39:18 -07:00
parent e8d3e6fa63 8b921e4cf3
commit 98329b58fb
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GitTfs/Commands/Rcheckin.cs
+6 -2
View File
@@ -96,7 +96,9 @@ namespace Sep.Git.Tfs.Commands
string target = strs[0];
string[] gitParents = strs.AsEnumerable().Skip(1).Where(hash => hash != currentParent).ToArray();
string commitMessage = repo.GetCommitMessage(target, currentParent).Trim(' ', '\r', '\n');
string commitMessage = _checkinOptions.NoGenerateCheckinComment
? repo.GetCommitMessage(target)
: repo.GetCommitMessage(target, currentParent);
var commitSpecificCheckinOptions = _checkinOptionsFactory.BuildCommitSpecificCheckinOptions(_checkinOptions, commitMessage);
_stdout.WriteLine("Starting checkin of {0} '{1}'", target.Substring(0, 8), commitSpecificCheckinOptions.CheckinComment);
@@ -153,7 +155,9 @@ namespace Sep.Git.Tfs.Commands
string target = strs[0];
string[] gitParents = strs.AsEnumerable().Skip(1).Where(hash => hash != tfsLatest).ToArray();
string commitMessage = repo.GetCommitMessage(target, tfsLatest).Trim(' ', '\r', '\n');
string commitMessage = _checkinOptions.NoGenerateCheckinComment
? repo.GetCommitMessage(target)
: repo.GetCommitMessage(target, tfsLatest);
var commitSpecificCheckinOptions = _checkinOptionsFactory.BuildCommitSpecificCheckinOptions(_checkinOptions, commitMessage);
_stdout.WriteLine("Starting checkin of {0} '{1}'", target.Substring(0, 8), commitSpecificCheckinOptions.CheckinComment);
long newChangesetId = tfsRemote.Checkin(target, parentChangeset, commitSpecificCheckinOptions);
GitTfs/Core/GitRepository.cs
+5
View File
@@ -342,6 +342,11 @@ namespace Sep.Git.Tfs.Core
return GitTfsConstants.TfsCommitInfoRegex.Replace(message.ToString(), "").Trim(' ', '\r', '\n');
}
public string GetCommitMessage(string commitish)
{
return GetCommitMessage(commitish, commitish + "^");
}
private static string NormalizeLineEndings(string input)
{
return string.IsNullOrEmpty(input)
GitTfs/Core/IGitRepository.cs
+1
View File
@@ -29,6 +29,7 @@ namespace Sep.Git.Tfs.Core
GitCommit GetCommit(string commitish);
Dictionary<string, GitObject> GetObjects();
string GetCommitMessage(string head, string parentCommitish);
string GetCommitMessage(string commitish);
string AssertValidBranchName(string gitBranchName);
bool CreateBranch(string gitBranchName, string target);
Branch RenameBranch(string oldName, string newName);