Merge "Support branches with name 'config'"

org.eclipse.jgit.test/tst/org/eclipse/jgit/storage/file/RefDirectoryTest.java

@@ -359,6 +359,19 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase {
 		assertTrue("empty objects/", refdir.getRefs("objects/").isEmpty());
 	}
 
+	@Test
+	public void testReadNotExistingBranchConfig() throws IOException {
+		assertNull("find branch config", refdir.getRef("config"));
+		assertNull("find branch config", refdir.getRef("refs/heads/config"));
+	}
+
+	@Test
+	public void testReadBranchConfig() throws IOException {
+		writeLooseRef("refs/heads/config", A);
+
+		assertNotNull("find branch config", refdir.getRef("config"));
+	}
+
 	@Test
 	public void testGetRefs_HeadsOnly_AllLoose() throws IOException {
 		Map<String, Ref> heads;

org.eclipse.jgit/src/org/eclipse/jgit/storage/file/RefDirectory.java

@@ -73,6 +73,7 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.eclipse.jgit.errors.InvalidObjectIdException;
 import org.eclipse.jgit.errors.LockFailedException;
 import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.errors.ObjectWritingException;
@@ -260,10 +261,17 @@ public class RefDirectory extends RefDatabase {
 		final RefList<Ref> packed = getPackedRefs();
 		Ref ref = null;
 		for (String prefix : SEARCH_PATH) {
-			ref = readRef(prefix + needle, packed);
+			try {
-			if (ref != null) {
+				ref = readRef(prefix + needle, packed);
-				ref = resolve(ref, 0, null, null, packed);
+				if (ref != null) {
-				break;
+					ref = resolve(ref, 0, null, null, packed);
+					break;
+				}
+			} catch (IOException e) {
+				if (!(!needle.contains("/") && "".equals(prefix) && e
+						.getCause() instanceof InvalidObjectIdException)) {
+					throw e;
+				}
 			}
 		}
 		fireRefsChanged();
@@ -937,7 +945,11 @@ public class RefDirectory extends RefDatabase {
 			while (0 < n && Character.isWhitespace(buf[n - 1]))
 				n--;
 			String content = RawParseUtils.decode(buf, 0, n);
-			throw new IOException(MessageFormat.format(JGitText.get().notARef, name, content));
+
+			IOException ioException = new IOException(MessageFormat.format(JGitText.get().notARef,
+					name, content));
+			ioException.initCause(notRef);
+			throw ioException;
 		}
 		return new LooseUnpeeled(otherSnapshot, name, id);
 	}