Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-03 20:15:52 +01:00
Code Issues Packages Projects Releases Activity

implement branch option for git log command

Browse Source
This commit is contained in:
Sebastian Sdorra
2012-07-27 11:09:32 +02:00
parent b1b6f5e4d1
commit f50e3d912b
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitUtil.java
View File

@@ -250,6 +250,10 @@ public class GitUtil
throws IOException
{
ObjectId branchId = null;
if ( ! branchName.startsWith(REF_HEAD) ){
branchName = PREFIX_HEADS.concat(branchName);
}
Ref ref = repo.getRef(branchName);
if (ref != null)

11
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitLogCommand.java
View File

@@ -217,7 +217,16 @@ public class GitLogCommand extends AbstractGitCommand implements LogCommand
PathFilter.create(request.getPath()), TreeFilter.ANY_DIFF));
}
ObjectId head = GitUtil.getRepositoryHead(gr);
ObjectId head = null;
if (!Strings.isNullOrEmpty(request.getBranch()))
{
head = GitUtil.getBranchId(gr, request.getBranch());
}
else
{
head = GitUtil.getRepositoryHead(gr);
}
if (head != null)
{