1 files changed, 4 insertions, 8 deletions
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java
index a136df5618..3fe50d6682 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Clone.java
@@ -93,15 +93,11 @@ class Clone extends AbstractFetchCommand {
 
 		final URIish uri = new URIish(sourceUri);
 		if (localName == null) {
-			String p = uri.getPath();
-			while (p.endsWith("/"))
-				p = p.substring(0, p.length() - 1);
-			final int s = p.lastIndexOf('/');
-			if (s < 0)
+			try {
+				localName = uri.getHumanishName();
+			} catch (IllegalArgumentException e) {
 				throw die("cannot guess local name from " + sourceUri);
-			localName = p.substring(s + 1);
-			if (localName.endsWith(".git"))
-				localName = localName.substring(0, localName.length() - 4);
+			}
 		}
 		if (gitdir == null)
 			gitdir = new File(localName, ".git");