Skip to content

Git: Improve handling of ambigous ID input in checkout dialog #9123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthiasblaesing merged 1 commit into from
Jan 5, 2026
Merged

Git: Improve handling of ambigous ID input in checkout dialog #9123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ide/git/src/org/netbeans/modules/git/ui/repository/RevisionInfoPanelController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.io.File;
import java.text.DateFormat;
import java.util.Date;
import org.eclipse.jgit.errors.AmbiguousObjectException;
import org.netbeans.modules.git.client.GitClient;
import org.netbeans.libs.git.GitException;
import org.netbeans.libs.git.GitRevisionInfo;
Expand Down Expand Up @@ -182,7 +183,7 @@ public void run () {
mergedStatus = commonAncestor != null && commonAncestor.getRevision().equals(revisionInfo.getRevision());
}
} catch (GitException ex) {
if (!(ex instanceof GitException.MissingObjectException)) {
if (!(ex instanceof GitException.MissingObjectException || ex.getCause() instanceof AmbiguousObjectException)) {
GitClientExceptionHandler.notifyException(ex, true);
}
revisionInfo = null;
Expand Down
2 changes: 1 addition & 1 deletion ide/libs.git/src/org/netbeans/libs/git/jgit/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# under the License.

MSG_Exception_IdNotACommit = The given id [{0}] is not a commit or an annotated tag.
MSG_Exception_IdNotUnique = Given objectId [{0}] is not unique.
MSG_Exception_IdAmbiguous = The given objectId [{0}] is ambiguous.
2 changes: 1 addition & 1 deletion ide/libs.git/src/org/netbeans/libs/git/jgit/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ public static ObjectId parseObjectId (Repository repository, String objectId) th
} catch (RevisionSyntaxException ex) {
throw new GitException.MissingObjectException(objectId, GitObjectType.COMMIT, ex);
} catch (AmbiguousObjectException ex) {
throw new GitException(MessageFormat.format(Utils.getBundle(Utils.class).getString("MSG_Exception_IdNotACommit"), objectId), ex); //NOI18N
throw new GitException(MessageFormat.format(Utils.getBundle(Utils.class).getString("MSG_Exception_IdAmbiguous"), objectId), ex); //NOI18N
} catch (IOException ex) {
throw new GitException(ex);
}
Expand Down
Loading