From 87db82f28371bac4a8bf4551ad964078301da8bd Mon Sep 17 00:00:00 2001 From: James Moger Date: Sat, 24 Mar 2012 14:50:35 -0400 Subject: Ensure that FederationPullExecutor resets to FETCH_HEAD for mirrors --- src/com/gitblit/utils/JGitUtils.java | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'src/com/gitblit/utils/JGitUtils.java') diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java index 99b2f738..f495a38f 100644 --- a/src/com/gitblit/utils/JGitUtils.java +++ b/src/com/gitblit/utils/JGitUtils.java @@ -36,8 +36,6 @@ import java.util.zip.ZipOutputStream; import org.eclipse.jgit.api.CloneCommand; import org.eclipse.jgit.api.FetchCommand; import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.ResetCommand; -import org.eclipse.jgit.api.ResetCommand.ResetType; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.diff.DiffFormatter; @@ -252,27 +250,6 @@ public class JGitUtils { return fetchRes; } - /** - * Reset HEAD to the latest remote tracking commit. - * - * @param repository - * @param remoteRef - * the remote tracking reference (e.g. origin/master) - * @return Ref - * @throws Exception - */ - public static Ref resetHEAD(Repository repository, String remoteRef) throws Exception { - if (!remoteRef.startsWith(Constants.R_REMOTES)) { - remoteRef = Constants.R_REMOTES + remoteRef; - } - Git git = new Git(repository); - ResetCommand reset = git.reset(); - reset.setMode(ResetType.SOFT); - reset.setRef(remoteRef); - Ref result = reset.call(); - return result; - } - /** * Creates a bare repository. * -- cgit v1.2.3