commit 9b8bc4961c00391842617260d21290f490dfc20d
author Edwin Kempin <ekempin@google.com> Thu Nov 24 12:45:12 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 24 12:45:12 2022 +0000
tree 0281f28e5ee9391041675974e9266ea8ed9ca617
parent 479cf6eb26b9afdea11bb6c5dc86cb28ce7ae9db
parent 3502500a4507485130a7e8e20047d5ee9c16b498

Merge "Fix ISE when user provides an ambiguous base revision"

java/com/google/gerrit/server/project/RefUtil.java

diff --git a/java/com/google/gerrit/server/project/RefUtil.java b/java/com/google/gerrit/server/project/RefUtil.java
index e86ad41..07f7ba5 100644
--- a/java/com/google/gerrit/server/project/RefUtil.java
+++ b/java/com/google/gerrit/server/project/RefUtil.java
@@ -23,6 +23,7 @@
 import com.google.gerrit.extensions.restapi.UnprocessableEntityException;
 import java.io.IOException;
 import java.util.Collections;
+import org.eclipse.jgit.errors.AmbiguousObjectException;
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.MissingObjectException;
 import org.eclipse.jgit.errors.RevisionSyntaxException;
@@ -49,6 +50,9 @@
     } catch (RevisionSyntaxException e) {
       throw new UnprocessableEntityException(
           String.format("base revision \"%s\" is invalid", baseRevision), e);
+    } catch (AmbiguousObjectException e) {
+      throw new UnprocessableEntityException(
+          String.format("base revision \"%s\" is ambiguous", baseRevision), e);
     }
   }