8000 Use implicit GitOid to ObjectId cast everywhere · MicrosoftWebMatrix/libgit2sharp@82a86f2 · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
10000
Appearance settings

Commit 82a86f2

Browse files
dahlbyknulltoken
dahlbyk
authored and
nulltoken
committed
Use implicit GitOid to ObjectId cast everywhere
1 parent 09beddc commit 82a86f2

File tree

7 files changed

+21
-21
lines changed

7 files changed

+21
-21
lines changed

‎LibGit2Sharp/Core/Proxy.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static ObjectId git_blob_create_fromchunks(RepositorySafeHandle repo, Fil
4545
int res = NativeMethods.git_blob_create_fromchunks(ref oid, repo, hintpath, fileCallback, IntPtr.Zero);
4646
Ensure.ZeroResult(res);
4747

48-
return new ObjectId(oid);
48+
return oid;
4949
}
5050
}
5151

@@ -57,7 +57,7 @@ public static ObjectId git_blob_create_fromdisk(RepositorySafeHandle repo, FileP
5757
int res = NativeMethods.git_blob_create_fromdisk(ref oid, repo, path);
5858
Ensure.ZeroResult(res);
5959

60-
return new ObjectId(oid);
60+
return oid;
6161
}
6262
}
6363

@@ -69,7 +69,7 @@ public static ObjectId git_blob_create_fromfile(RepositorySafeHandle repo, FileP
6969
int res = NativeMethods.git_blob_create_fromworkdir(ref oid, repo, path);
7070
Ensure.ZeroResult(res);
7171

72-
return new ObjectId(oid);
72+
return oid;
7373
}
7474
}
7575

@@ -265,7 +265,7 @@ public static ObjectId git_commit_create(
265265
committerHandle, encoding, prettifiedMessage, treePtr.ObjectPtr, parentObjectPtrs.Count, parentsPtrs);
266266
Ensure.ZeroResult(res);
267267

268-
return new ObjectId(commitOid);
268+
return commitOid;
269269
}
270270
}
271271

@@ -769,7 +769,7 @@ public static void git_index_write(IndexSafeHandle index)
769769
}
770770
}
771771

772-
public static GitOid git_tree_create_fromindex(Index index)
772+
public static ObjectId git_tree_create_fromindex(Index index)
773773
{
774774
using (ThreadAffinity())
775775
{
@@ -801,7 +801,7 @@ public static ObjectId git_merge_base(RepositorySafeHandle repo, Commit first, C
801801

802802
Ensure.ZeroResult(res);
803803

804-
return new ObjectId(ret);
804+
return ret;
805805
}
806806
}
807807

@@ -848,7 +848,7 @@ public static ObjectId git_note_create(
848848
int res = NativeMethods.git_note_create(out noteOid, repo, authorHandle, committerHandle, notes_ref, ref oid, note, force ? 1 : 0);
849849
Ensure.ZeroResult(res);
850850

851-
return new ObjectId(noteOid);
851+
return noteOid;
852852
}
853853
}
854854

@@ -1699,7 +1699,7 @@ public static ObjectId git_revwalk_next(RevWalkerSafeHandle walker)
16991699

17001700
Ensure.ZeroResult(res);
17011701

1702-
return new ObjectId(ret);
1702+
return ret;
17031703
}
17041704
}
17051705

@@ -1837,7 +1837,7 @@ public static ObjectId git_tag_create(
18371837
int res = NativeMethods.git_tag_create(out oid, repo, name, objectPtr.ObjectPtr, taggerHandle, message, allowOverwrite);
18381838
Ensure.ZeroResult(res);
18391839

1840-
return new ObjectId(oid);
1840+
return oid;
18411841
}
18421842
}
18431843

@@ -1850,7 +1850,7 @@ public static ObjectId git_tag_create_lightweight(RepositorySafeHandle repo, str
18501850
int res = NativeMethods.git_tag_create_lightweight(out oid, repo, name, objectPtr.ObjectPtr, allowOverwrite);
18511851
Ensure.ZeroResult(res);
18521852

1853-
return new ObjectId(oid);
1853+
return oid;
18541854
}
18551855
}
18561856

@@ -1997,7 +1997,7 @@ public static ObjectId git_treebuilder_write(RepositorySafeHandle repo, TreeBuil
19971997
int res = NativeMethods.git_treebuilder_write(out oid, repo, bld);
19981998
Ensure.ZeroResult(res);
19991999

2000-
return new ObjectId(oid);
2000+
return oid;
20012001
}
20022002
}
20032003

‎LibGit2Sharp/IndexEntry.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ internal static IndexEntry BuildFromPtr(Repository repo, IndexEntrySafeHandle ha
6161
return new IndexEntry
6262
{
6363
Path = path.Native,
64-
Id = new ObjectId(entry.oid),
64+
Id = entry.oid,
6565
state = () => repo.Index.RetrieveStatus(path.Native),
6666
StageLevel = Proxy.git_index_entry_stage(handle),
6767
Mode = (Mode)entry.Mode

‎LibGit2Sharp/Network.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public virtual IEnumerable<FetchHead> FetchHeads
4040

4141
return Proxy.git_repository_fetchhead_foreach(
4242
repository.Handle,
43-
(name, url, oid, isMerge) => new FetchHead(repository, name, url, new ObjectId(oid), isMerge, i++));
43+
(name, url, oid, isMerge) => new FetchHead(repository, name, url, oid, isMerge, i++));
4444
}
4545
}
4646

@@ -76,7 +76,7 @@ public virtual IEnumerable<DirectReference> ListReferences(Remote remote)
7676
return -1;
7777
}
7878

79-
ObjectId oid = new ObjectId(remoteHead.Oid);
79+
ObjectId oid = remoteHead.Oid;
8080
string name = Utf8Marshaler.FromNative(remoteHead.NamePtr);
8181
directReferences.Add(new DirectReference(name, this.repository, oid));
8282

‎LibGit2Sharp/NoteCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public virtual IEnumerable<Note> this[string @namespace]
114114
string canonicalNamespace = NormalizeToCanonicalName(@namespace);
115115

116116
return Proxy.git_note_foreach(repo.Handle, canonicalNamespace,
117-
(blobId,annotatedObjId) => RetrieveNote(new ObjectId(annotatedObjId), canonicalNamespace));
117+
(blobId,annotatedObjId) => RetrieveNote(annotatedObjId, canonicalNamespace));
118118
}
119119
}
120120

‎LibGit2Sharp/RemoteCallbacks.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private int GitUpdateTipsHandler(IntPtr str, ref GitOid oldId, ref GitOid newId,
9999
if (onUpdateTips != null)
100100
{
101101
string refName = Utf8Marshaler.FromNative(str);
102-
result = onUpdateTips(refName, new ObjectId(oldId), new ObjectId(newId));
102+
result = onUpdateTips(refName, oldId, newId);
103103
}
104104

105105
return result;

‎LibGit2Sharp/Repository.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -672,8 +672,8 @@ public Commit Commit(string message, Signature author, Signature committer, bool
672672
throw new LibGit2SharpException("Can not amend anything. The Head doesn't point at any commit.");
673673
}
674674

675-
GitOid treeOid = Proxy.git_tree_create_fromindex(Index);
676-
var tree = this.Lookup<Tree>(new ObjectId(treeOid));
675+
var treeId = Proxy.git_tree_create_fromindex(Index);
676+
var tree = this.Lookup<Tree>(treeId);
677677

678678
var parents = RetrieveParentsOfTheCommitBeingCreated(amendPreviousCommit);
679679

@@ -784,7 +784,7 @@ public virtual IEnumerable<MergeHead> MergeHeads
784784
{
785785
int i = 0;
786786
return Proxy.git_repository_mergehead_foreach(Handle,
787-
commitId => new MergeHead(this, new ObjectId(commitId), i++));
787+
commitId => new MergeHead(this, commitId, i++));
788788
}
789789
}
790790

‎LibGit2Sharp/TreeChanges.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ private TreeEntryChanges AddFileChange(GitDiffDelta delta, GitDiffLineOrigin lin
9595
var oldFilePath = FilePathMarshaler.FromNative(delta.OldFile.Path);
9696
var newMode = (Mode)delta.NewFile.Mode;
9797
var oldMode = (Mode)delta.OldFile.Mode;
98-
var newOid = new ObjectId(delta.NewFile.Oid);
99-
var oldOid = new ObjectId(delta.OldFile.Oid);
98+
var newOid = delta.NewFile.Oid;
99+
var oldOid = delta.OldFile.Oid;
100100

101101
if (delta.Status == ChangeKind.Untracked)
102102
{

0 commit comments

Comments
 (0)
0