Browse Source

Merge "Allow '@' as last character of ref"

stable-5.0
Christian Halstrick 7 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
7cf29ba3e3
  1. 2
      org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryResolveTest.java
  2. 2
      org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryResolveTest.java

@ -324,6 +324,8 @@ public class RepositoryResolveTest extends SampleDataRepositoryTestCase {
assertFalse(Repository.isValidRefName("x/a\\b"));
assertFalse(Repository.isValidRefName("x/a\u0000"));
db.resolve("x/a@");
assertUnparseable(".");
assertUnparseable("x@{3");
assertUnparseable("x[b");

2
org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java

@ -686,6 +686,8 @@ public abstract class Repository implements AutoCloseable {
case '@':
if (rev != null)
throw new RevisionSyntaxException(revstr);
if (i + 1 == revChars.length)
continue;
if (i + 1 < revChars.length && revChars[i + 1] != '{')
continue;
int m;

Loading…
Cancel
Save