Don't extract the name of a package from its description.

utils/pub/git_source.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #library('git_source');
 
 #import('io.dart');
 #import('package.dart');
 #import('source.dart');
 #import('source_registry.dart');
@@ skipping 39 matching lines @@
       .chain((path) {
       revisionCachePath = path;
       return exists(revisionCachePath);
     }).chain((exists) {
       if (exists) return new Future.immediate(null);
       return _clone(_repoCachePath(id), revisionCachePath, mirror: false);
     }).chain((_) {
       var ref = _getEffectiveRef(id);
       if (ref == 'HEAD') return new Future.immediate(null);
       return _checkOut(revisionCachePath, ref);
-    }).chain((_) => Package.load(revisionCachePath, systemCache.sources));
+    }).chain((_) {
+      return Package.load(id.name, revisionCachePath, systemCache.sources);
+    });
   }
 
   /**
-   * The package name of a Git repo is the name of the directory into which
-   * it'll be cloned.
-   */
-  String packageName(description) {
-    return basename(_getUrl(description)
-        .replaceFirst(const RegExp(@"(\.git)?/?$"), ""));
-  }
-
-  /**
    * Ensures [description] is a Git URL.
    */
   void validateDescription(description, [bool fromLockFile = false]) {
     // A single string is assumed to be a Git URL.
     if (description is String) return;
     if (description is! Map || !description.containsKey('url')) {
       throw new FormatException("The description must be a Git URL or a map "
           "with a 'url' key.");
     }
     description = new Map.from(description);
@@ skipping 19 matching lines @@
       _getRef(description1) == _getRef(description2);
   }
 
   /**
    * Attaches a specific commit to [id] to disambiguate it.
    */
   Future<PackageId> resolveId(PackageId id) {
     return _revisionAt(id).transform((revision) {
       var description = {'url': _getUrl(id), 'ref': _getRef(id)};
       description['resolved-ref'] = revision;
-      return new PackageId(this, id.version, description);
+      return new PackageId(id.name, this, id.version, description);
     });
   }
 
   /**
    * Ensure that the canonical clone of the repository referred to by [id] (the
    * one in `<system cache>/git/cache`) exists and is up-to-date. Returns a
    * future that completes once this is finished and throws an exception if it
    * fails.
    */
   Future _ensureRepoCache(PackageId id) {
@@ skipping 107 matching lines @@
 
   /**
    * Returns [description] if it's a description, or [PackageId.description] if
    * it's a [PackageId].
    */
   _getDescription(description) {
     if (description is PackageId) return description.description;
     return description;
   }
 }