Skip to content

Remove Tag from TreeEntryTargetType enum #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 13, 2013
+5 −4
Merged

Remove Tag from TreeEntryTargetType enum #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f0efa0
Fix HasAny() enum helper to ease migration to .Net 4.0
nulltoken May 8, 2013
c000936
Mark TreeEntryTargetType.Tag as obsolete
martinwoodward May 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LibGit2Sharp/Core/EnumExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace LibGit2Sharp.Core
{
internal static class EnumExtensions
{
public static bool HasAny<T>(this Enum enumInstance, IEnumerable<T> entries)
public static bool HasAny(this Enum enumInstance, IEnumerable<Enum> entries)
{
return entries.Any(enumInstance.HasFlag);
}
Expand Down
4 changes: 2 additions & 2 deletions LibGit2Sharp/Index.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,13 +268,13 @@ public virtual void Move(IEnumerable<string> sourcePaths, IEnumerable<string> de
}

FileStatus sourceStatus = keyValuePair.Key.Item2;
if (sourceStatus.HasAny(new[] { FileStatus.Nonexistent, FileStatus.Removed, FileStatus.Untracked, FileStatus.Missing }))
if (sourceStatus.HasAny(new Enum[] { FileStatus.Nonexistent, FileStatus.Removed, FileStatus.Untracked, FileStatus.Missing }))
{
throw new LibGit2SharpException(string.Format(CultureInfo.InvariantCulture, "Unable to move file '{0}'. Its current status is '{1}'.", sourcePath, sourceStatus));
}

FileStatus desStatus = keyValuePair.Value.Item2;
if (desStatus.HasAny(new[] { FileStatus.Nonexistent, FileStatus.Missing }))
if (desStatus.HasAny(new Enum[] { FileStatus.Nonexistent, FileStatus.Missing }))
{
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion LibGit2Sharp/TreeEntryDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class TreeEntryDefinition : IEquatable<TreeEntryDefinition>
private static readonly LambdaEqualityHelper<TreeEntryDefinition> equalityHelper =
new LambdaEqualityHelper<TreeEntryDefinition>(x => x.Mode, x => x.TargetType, x => x.TargetId);

internal static readonly Mode[] BlobModes = new[] { Mode.NonExecutableFile, Mode.ExecutableFile, Mode.NonExecutableGroupWritableFile, Mode.SymbolicLink };
internal static readonly Enum[] BlobModes = new Enum[] { Mode.NonExecutableFile, Mode.ExecutableFile, Mode.NonExecutableGroupWritableFile, Mode.SymbolicLink };

/// <summary>
/// Needed for mocking purposes.
Expand Down
1 change: 1 addition & 0 deletions LibGit2Sharp/TreeEntryTargetType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public enum TreeEntryTargetType
/// <summary>
/// An annotated tag object.
/// </summary>
[Obsolete("This entry will be removed in the next release as it is not a valid TreeEntryTargetType.")]
Tag,

/// <summary>
Expand Down