@@ -670,36 +670,29 @@ public List<VCSCommit> getCommitsRange(String branchName, String startRevision,
670
670
}
671
671
}
672
672
673
- private RevCommit getHeadRevCommit (String branchName ) {
673
+ @ Override
674
+ public VCSCommit getHeadCommit (String branchName ) {
674
675
try (IVCSLockedWorkingCopy wc = repo .getVCSLockedWorkingCopy ();
675
676
Git git = getLocalGit (wc );
676
677
Repository gitRepo = git .getRepository ();
677
678
RevWalk rw = new RevWalk (gitRepo )) {
678
679
679
- String bn = getRealBranchName ( branchName );
680
-
681
- Ref ref = gitRepo .exactRef (REFS_REMOTES_ORIGIN + bn );
680
+ checkout ( git , gitRepo , null , null );
681
+
682
+ Ref ref = gitRepo .exactRef (REFS_REMOTES_ORIGIN + getRealBranchName ( branchName ) );
682
683
if (ref == null ) {
683
684
return null ;
684
685
}
685
686
ObjectId commitId = ref .getObjectId ();
686
- return rw .parseCommit ( commitId );
687
+ RevCommit revCommit = rw .parseCommit ( commitId );
688
+ return getVCSCommit (revCommit );
687
689
} catch (GitAPIException e ) {
688
690
throw new EVCSException (e );
689
691
} catch (Exception e ) {
690
692
throw new RuntimeException (e );
691
693
}
692
694
}
693
695
694
- @ Override
695
- public VCSCommit getHeadCommit (String branchName ) {
696
- RevCommit branchHeadCommit = getHeadRevCommit (getRealBranchName (branchName ));
697
- if (branchHeadCommit == null ) {
698
- return null ;
699
- }
700
- return getVCSCommit (branchHeadCommit );
701
- }
702
-
703
696
@ Override
704
697
public String toString () {
705
698
return "GitVCS [url=" + repo .getRepoUrl () + "]" ;
0 commit comments