diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2025-03-11 08:43:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <support@gerrithub.io> | 2025-03-11 08:43:23 +0000 |
| commit | e7e851ed88a1ce8ca1247d5792e84c4f01c3c540 (patch) | |
| tree | 14191058f4f01f10cc3fd46bf8a43073648380b8 /org.eclipse.jgit.pgm/src/org/eclipse/jgit | |
| parent | 52dc9fdd0d65fa06d6c98072a16b181a024c533b (diff) | |
| parent | 82d19573141697b1b9779755527d557d3fdb5d7c (diff) | |
| download | jgit-master.tar.gz jgit-master.zip | |
Diffstat (limited to 'org.eclipse.jgit.pgm/src/org/eclipse/jgit')
| -rw-r--r-- | org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java index 229d54d44f..7a218ec926 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Checkout.java @@ -18,6 +18,7 @@ import java.util.List; import org.eclipse.jgit.api.CheckoutCommand; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.CheckoutConflictException; +import org.eclipse.jgit.api.errors.InvalidRefNameException; import org.eclipse.jgit.api.errors.RefAlreadyExistsException; import org.eclipse.jgit.api.errors.RefNotFoundException; import org.eclipse.jgit.lib.Constants; @@ -94,7 +95,16 @@ class Checkout extends TextBuiltin { outw.println(MessageFormat.format( CLIText.get().switchedToBranch, Repository.shortenRefName(ref.getName()))); - } catch (RefNotFoundException e) { + } catch (InvalidRefNameException e){ + if (name == null){ + throw die(MessageFormat + .format("a valid ref is expected",e)); + } else { + throw die(MessageFormat + .format(CLIText.get().notAValidRefName, name, e)); + } + } + catch (RefNotFoundException e) { throw die(MessageFormat .format(CLIText.get().pathspecDidNotMatch, name), e); } catch (RefAlreadyExistsException e) { |