From b2ec6405e4f3321e64bdbc2287435b78fabef971 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Wed, 11 Nov 2015 15:50:39 -0800 Subject: RefDirectory: Do not use search path to find additional refs Psuedorefs like FETCH_HEAD and MERGE_HEAD are supposed to be directly under the .git directory, not in other locations in the SEARCH_PATH like refs/ and refs/heads/. Use exactRef to access them. Change-Id: Iab8ac47008822fa78fc0691e239e518c34d7a98e Signed-off-by: Jonathan Nieder --- .../src/org/eclipse/jgit/internal/storage/file/RefDirectory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'org.eclipse.jgit/src') diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 71f2e9e23f..dcf30c713e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -412,7 +412,7 @@ public class RefDirectory extends RefDatabase { public List getAdditionalRefs() throws IOException { List ret = new LinkedList<>(); for (String name : additionalRefsNames) { - Ref r = getRef(name); + Ref r = exactRef(name); if (r != null) ret.add(r); } -- cgit v1.2.3