MicrosoftWebMatrix
diff --git a/‎LibGit2Sharp/ObjectId.cs
Lines changed: 1 addition & 6 deletions b/‎LibGit2Sharp/ObjectId.cs
Lines changed: 1 addition & 6 deletions
diff --git a/‎LibGit2Sharp/ReferenceCollection.cs
Lines changed: 20 additions & 11 deletions b/‎LibGit2Sharp/ReferenceCollection.cs
Lines changed: 20 additions & 11 deletions
@@ -87,12 +87,7 @@ public byte[] RawId
         /// <returns>true if the <paramref name="sha"/> parameter was converted successfully; otherwise, false.</returns>
         public static bool TryParse(string sha, out ObjectId result)
         {
-            return TryParseInternal(sha, true, out result);
-        }
-
-        internal static bool TryParseInternal(string sha, bool allowShortIdentifier, out ObjectId result)
-        {
-            result = BuildFrom(sha, false, allowShortIdentifier);
+            result = BuildFrom(sha, false, true);
 
             return (result == null) ? false : true;
         }
 
@@ -94,23 +94,32 @@ private int CreateSymbolicReference(string name, string target, bool allowOverwr
             return NativeMethods.git_reference_create_symbolic(out reference, repo.Handle, name, target, allowOverwrite);
         }
 
-        private int CreateDirectReference(string name, ObjectId targetOid, bool allowOverwrite, out IntPtr reference)
+        private int CreateDirectReference(string name, ObjectId targetId, bool allowOverwrite, out IntPtr reference)
         {
-            if (targetOid is AbbreviatedObjectId)   //TODO: This is hacky... :-/
-            {
-                var obj = repo.Lookup(targetOid);
-                if (obj == null)
-                {
-                    Ensure.Success((int) GitErrorCode.GIT_ENOTFOUND);
-                }
-                targetOid = obj.Id;
-            }
+            targetId = Unabbreviate(targetId);
 
-            GitOid oid = targetOid.Oid;
+            GitOid oid = targetId.Oid;
 
             return NativeMethods.git_reference_create_oid(out reference, repo.Handle, name, ref oid, allowOverwrite);
         }
 
+        private ObjectId Unabbreviate(ObjectId targetId)
+        {
+            if (!(targetId is AbbreviatedObjectId))
+            {
+                return targetId;
+            }
+
+            var obj = repo.Lookup(targetId);
+            
+            if (obj == null)
+            {
+                Ensure.Success((int) GitErrorCode.GIT_ENOTFOUND);
+            }
+
+            return obj.Id;
+        }
+
         /// <summary>
         ///   Delete a reference with the specified name
         /// </summary>
Original file line number	Diff line number	Diff line change
`@@ -87,12 +87,7 @@ public byte[] RawId`
`87`	`87`	`/// <returns>true if the <paramref name="sha"/> parameter was converted successfully; otherwise, false.</returns>`
`88`	`88`	`public static bool TryParse(string sha, out ObjectId result)`
`89`	`89`	`{`
`90`		`- return TryParseInternal(sha, true, out result);`
`91`		`- }`
`92`		`-`
`93`		`- internal static bool TryParseInternal(string sha, bool allowShortIdentifier, out ObjectId result)`
`94`		`- {`
`95`		`- result = BuildFrom(sha, false, allowShortIdentifier);`
	`90`	`+ result = BuildFrom(sha, false, true);`
`96`	`91`
`97`	`92`	`return (result == null) ? false : true;`
`98`	`93`	`}`