Browse Source

repo: Do not use search path to find refs/remotes/origin/<branch>

When running from a non-bare repository, "jgit repo" checks whether
the rev passed in is a sha1 or branch name and in the latter case will
check out origin/<branch>.

We are expecting refs/remotes/origin/<branch>, but as a side effect of
using getRef we also end up looking for refs/origin/<branch>,
refs/heads/origin/<branch>, and so on.  Avoid that by using exactRef
instead.

Signed-off-by: Jonathan Nieder <jrn@google.com>
Change-Id: I670b2e48a88138a1f2104ea201baa958e9edbddb
stable-4.3
Jonathan Nieder 9 years ago
parent
commit
fe98218e0d
  1. 5
      org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java

5
org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java

@ -42,6 +42,9 @@
*/
package org.eclipse.jgit.gitrepo;
import static org.eclipse.jgit.lib.Constants.DEFAULT_REMOTE_NAME;
import static org.eclipse.jgit.lib.Constants.R_REMOTES;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@ -574,7 +577,7 @@ public class RepoCommand extends GitCommand<RevCommit> {
private static String findRef(String ref, Repository repo)
throws IOException {
if (!ObjectId.isId(ref)) {
Ref r = repo.getRef(Constants.DEFAULT_REMOTE_NAME + "/" + ref); //$NON-NLS-1$
Ref r = repo.exactRef(R_REMOTES + DEFAULT_REMOTE_NAME + "/" + ref); //$NON-NLS-1$
if (r != null)
return r.getName();
}

Loading…
Cancel
Save