Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Clean-up trailing whitespaces

For the psychopath that lies deep down in each one of us.
  • Loading branch information...
commit f705718c1bb83a268644952df8b2221e86beb754 1 parent 547a6bd
@yorah yorah authored
View
4 .travis.yml
@@ -2,7 +2,7 @@
# see travis-ci.org for details
language: c
-
+
# Make sure CMake is installed
install:
- sudo apt-get install cmake mono-devel mono-gmcs
@@ -22,7 +22,7 @@ script:
branches:
only:
- vNext
-
+
# Notify development list when needed
notifications:
recipients:
View
2  CHANGES.md
@@ -36,7 +36,7 @@
- Direct creation or Blobs, Trees and Commits without the workdir nor index involvement (#135)
- New Diff namespace: supports tree-to-tree, tree-to-index and blob-to-blob comparisons (#136)
- Add Commits.FindCommonAncestor() (#149)
-
+
### Changes
- Deprecate repo.Branches.Checkout() in favor of repo.Checkout()
View
2  CI-build.msbuild
@@ -10,7 +10,7 @@
TaskName="Xunit.Runner.MSBuild.xunit" />
<Target Name="Clean">
<Message Text="Commit SHA = $(CommitSha)" />
-
+
<WriteLinesToFile Condition="'$(CommitSha)' != ''"
File="$(RootDir)\LibGit2Sharp\libgit2sharp_hash.txt"
Lines="$(CommitSha)"
View
2  LibGit2Sharp.Tests/BranchFixture.cs
@@ -484,7 +484,7 @@ public void CanSetLocalUpstreamBranch()
Assert.False(branch.IsTracking);
Branch upstreamBranch = repo.Branches[upstreamBranchName];
-
+
repo.Branches.Update(branch,
b => b.Upstream = upstreamBranch.CanonicalName);
View
2  LibGit2Sharp.Tests/CommitFixture.cs
@@ -494,7 +494,7 @@ public void CanCommitWithSignatureFromConfig()
{
SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
- using (var repo = Repository.Init(scd.DirectoryPath))
+ using (var repo = Repository.Init(scd.DirectoryPath))
{
string dir = repo.Info.Path;
Assert.True(Path.IsPathRooted(dir));
View
18 LibGit2Sharp.Tests/IndexFixture.cs
@@ -593,32 +593,32 @@ public void PathsOfIndexEntriesAreExpressedInNativeFormat()
{
// Initialize a new repository
SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
-
+
const string directoryName = "directory";
const string fileName = "Testfile.txt";
-
+
// Create a file and insert some content
string directoryPath = Path.Combine(scd.RootedDirectoryPath, directoryName);
string filePath = Path.Combine(directoryPath, fileName);
-
+
Directory.CreateDirectory(directoryPath);
File.WriteAllText(filePath, "Anybody out there?");
-
+
// Initialize the repository
- using (var repo = Repository.Init(scd.DirectoryPath))
+ using (var repo = Repository.Init(scd.DirectoryPath))
{
// Stage the file
repo.Index.Stage(filePath);
-
+
// Get the index
Index index = repo.Index;
-
+
// Build relative path
string relFilePath = Path.Combine(directoryName, fileName);
-
+
// Get the index entry
IndexEntry ie = index[relFilePath];
-
+
// Make sure the IndexEntry has been found
Assert.NotNull(ie);
View
2  LibGit2Sharp.Tests/MergeFixture.cs
@@ -70,7 +70,7 @@ public void CanRetrieveTheBranchBeingMerged()
const string secondBranch = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef";
string mergeHeadPath = Path.Combine(repo.Info.Path, "MERGE_HEAD");
- File.WriteAllText(mergeHeadPath,
+ File.WriteAllText(mergeHeadPath,
string.Format("{0}{1}{2}{1}", firstBranch, "\n", secondBranch));
Assert.Equal(CurrentOperation.Merge, repo.Info.CurrentOperation);
View
2  LibGit2Sharp.Tests/MetaFixture.cs
@@ -133,7 +133,7 @@ private static string BuildNonTestableTypesMessage(Dictionary<Type, IEnumerable<
foreach (var kvp in nonTestableTypes)
{
- sb.AppendFormat("'{0}' cannot be easily abstracted in a testing context. Please make sure it either has a public constructor, or an empty protected constructor.{1}",
+ sb.AppendFormat("'{0}' cannot be easily abstracted in a testing context. Please make sure it either has a public constructor, or an empty protected constructor.{1}",
kvp.Key, Environment.NewLine);
foreach (string methodName in kvp.Value)
View
2  LibGit2Sharp.Tests/ReferenceFixture.cs
@@ -12,7 +12,7 @@ public class ReferenceFixture : BaseFixture
private readonly string[] expectedRefs = new[]
{
"refs/heads/br2", "refs/heads/deadbeef", "refs/heads/master", "refs/heads/packed", "refs/heads/packed-test",
- "refs/heads/test", "refs/notes/answer", "refs/notes/answer2", "refs/notes/commits", "refs/tags/e90810b",
+ "refs/heads/test", "refs/notes/answer", "refs/notes/answer2", "refs/notes/commits", "refs/tags/e90810b",
"refs/tags/lw", "refs/tags/point_to_blob", "refs/tags/test"
};
View
2  LibGit2Sharp.Tests/RepositoryFixture.cs
@@ -132,7 +132,7 @@ public void CanFetchFromRemoteByName()
public void CanReinitARepository()
{
SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
-
+
using (Repository repository = Repository.Init(scd.DirectoryPath))
using (Repository repository2 = Repository.Init(scd.DirectoryPath))
{
View
2  LibGit2Sharp.Tests/ResetHeadFixture.cs
@@ -94,7 +94,7 @@ private void AssertSoftReset(Func<Branch, string> branchIdentifierRetriever, boo
{
SelfCleaningDirectory scd = BuildSelfCleaningDirectory();
- using (var repo = Repository.Init(scd.DirectoryPath))
+ using (var repo = Repository.Init(scd.DirectoryPath))
{
FeedTheRepository(repo);
View
4 LibGit2Sharp.Tests/ResetIndexFixture.cs
@@ -86,7 +86,7 @@ public void CanResetTheIndexToTheContentOfACommitWithCommitishAsArgument()
RepositoryStatus newStatus = repo.Index.RetrieveStatus();
- var expected = new[] { "1.txt", Path.Combine("1", "branch_file.txt"), "deleted_staged_file.txt",
+ var expected = new[] { "1.txt", Path.Combine("1", "branch_file.txt"), "deleted_staged_file.txt",
"deleted_unstaged_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt" };
Assert.Equal(expected.Length, newStatus.Where(IsStaged).Count());
@@ -105,7 +105,7 @@ public void CanResetTheIndexToTheContentOfACommitWithCommitAsArgument()
RepositoryStatus newStatus = repo.Index.RetrieveStatus();
- var expected = new[] { "1.txt", Path.Combine("1", "branch_file.txt"), "deleted_staged_file.txt",
+ var expected = new[] { "1.txt", Path.Combine("1", "branch_file.txt"), "deleted_staged_file.txt",
"deleted_unstaged_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt" };
Assert.Equal(expected.Length, newStatus.Where(IsStaged).Count());
View
4 LibGit2Sharp.Tests/TestHelpers/DirectoryHelper.cs
@@ -60,14 +60,14 @@ public static void DeleteDirectory(string directoryPath)
try
{
Directory.Delete(directoryPath, false);
- }
+ }
catch (IOException)
{
Trace.WriteLine(string.Format("{0}The directory '{1}' could not be deleted!" +
"{0}Most of the time, this is due to an external process accessing the files in the temporary repositories created during the test runs, and keeping a handle on the directory, thus preventing the deletion of those files." +
"{0}Known and common causes include:" +
"{0}- Windows Search Indexer (go to the Indexing Options, in the Windows Control Panel, and exclude the bin folder of LibGit2Sharp.Tests)" +
- "{0}- Antivirus (exclude the bin folder of LibGit2Sharp.Tests from the paths scanned by your real-time antivirus){0}",
+ "{0}- Antivirus (exclude the bin folder of LibGit2Sharp.Tests from the paths scanned by your real-time antivirus){0}",
Environment.NewLine, Path.GetFullPath(directoryPath)));
}
}
View
46 LibGit2Sharp.Tests/TestHelpers/SkippableFactAttribute.cs
@@ -1,53 +1,53 @@
using System;
//**********************************************************************
-//* This file is based on the DynamicSkipExample.cs in xUnit which is
+//* This file is based on the DynamicSkipExample.cs in xUnit which is
//* provided under the following Ms-PL license:
//*
-//* This license governs use of the accompanying software. If you use
-//* the software, you accept this license. If you do not accept the
+//* This license governs use of the accompanying software. If you use
+//* the software, you accept this license. If you do not accept the
//* license, do not use the software.
-//*
+//*
//* 1. Definitions
-//*
-//* The terms "reproduce," "reproduction," "derivative works," and
-//* "distribution" have the same meaning here as under U.S. copyright
+//*
+//* The terms "reproduce," "reproduction," "derivative works," and
+//* "distribution" have the same meaning here as under U.S. copyright
//* law.
//*
-//* A "contribution" is the original software, or any additions or
+//* A "contribution" is the original software, or any additions or
//* changes to the software.
-//*
-//* A "contributor" is any person that distributes its contribution
+//*
+//* A "contributor" is any person that distributes its contribution
//* under this license.
-//*
-//* "Licensed patents" are a contributor's patent claims that read
+//*
+//* "Licensed patents" are a contributor's patent claims that read
//* directly on its contribution.
-//*
+//*
//* 2. Grant of Rights
-//*
+//*
//* (A) Copyright Grant- Subject to the terms of this license, including
-//* the license conditions and limitations in section 3, each
-//* contributor grants you a non-exclusive, worldwide, royalty-free
+//* the license conditions and limitations in section 3, each
+//* contributor grants you a non-exclusive, worldwide, royalty-free
//* copyright license to reproduce its contribution, prepare derivative
-//* works of its contribution, and distribute its contribution or any
+//* works of its contribution, and distribute its contribution or any
//* derivative works that you create.
//*
-//* (B) Patent Grant- Subject to the terms of this license, including
-//* the license conditions and limitations in section 3, each
-//* contributor grants you a non-exclusive, worldwide, royalty-free
+//* (B) Patent Grant- Subject to the terms of this license, including
+//* the license conditions and limitations in section 3, each
+//* contributor grants you a non-exclusive, worldwide, royalty-free
//* license under its licensed patents to make, have made, use, sell,
//* offer for sale, import, and/or otherwise dispose of its contribution
//* in the software or derivative works of the contribution in the
//* software.
//*
//* 3. Conditions and Limitations
-//*
+//*
//* (A) No Trademark License- This license does not grant you rights to
//* use any contributors' name, logo, or trademarks.
-//*
+//*
//* (B) If you bring a patent claim against any contributor over patents
//* that you claim are infringed by the software, your patent license
//* from such contributor to the software ends automatically.
-//*
+//*
//* (C) If you distribute any portion of the software, you must retain
//* all copyright, patent, trademark, and attribution notices that are
//* present in the software.
View
2  LibGit2Sharp.Tests/TreeFixture.cs
@@ -159,7 +159,7 @@ public void CanRetrieveTreeEntryPath()
TreeEntry blobTreeEntry = commitTree["1/branch_file.txt"];
Assert.Equal(completePath, blobTreeEntry.Path);
- // A tree entry is now fetched through a relative path to the
+ // A tree entry is now fetched through a relative path to the
// tree but exposes a complete path through its Path property
var subTree = treeTreeEntry.Target as Tree;
Assert.NotNull(subTree);
View
4 LibGit2Sharp/Conflict.cs
@@ -7,7 +7,7 @@ namespace LibGit2Sharp
/// Represents a group of index entries that describe a merge conflict
/// in the index. This is typically a set of ancestor, ours and theirs
/// entries for a given path.
- ///
+ ///
/// Any side may be missing to reflect additions or deletions in the
/// branches being merged.
/// </summary>
@@ -19,7 +19,7 @@ public class Conflict : IEquatable<Conflict>
private static readonly LambdaEqualityHelper<Conflict> equalityHelper =
new LambdaEqualityHelper<Conflict>(x => x.Ancestor, x => x.Ours, x => x.Theirs);
-
+
/// <summary>
/// Needed for mocking purposes.
/// </summary>
View
2  LibGit2Sharp/Core/Handles/SafeHandleBase.cs
@@ -98,7 +98,7 @@ protected override sealed bool ReleaseHandle()
* 2. The IsInvalid property is evaluated, and the result is false
* 3. The IsInvalid property is evaluated by the runtime to determine if
* finalization is necessary, and the result is now true
- *
+ *
* This can only happen if the value of `handle` is manipulated in an unexpected
* way (through the Reflection API or by a specially-crafted derived type that
* does not currently exist). The only safe course of action at this point in
View
2  LibGit2Sharp/Core/NativeMethods.cs
@@ -29,7 +29,7 @@ private sealed class LibraryLifetimeObject : CriticalFinalizerObject
// Ensure mono can JIT the .cctor and adjust the PATH before trying to load the native library.
// See https://github.com/libgit2/libgit2sharp/pull/190
[MethodImpl(MethodImplOptions.NoInlining)]
- public LibraryLifetimeObject()
+ public LibraryLifetimeObject()
{
Ensure.ZeroResult(git_threads_init());
AddHandle();
View
2  LibGit2Sharp/Core/Proxy.cs
@@ -1229,7 +1229,7 @@ public static ReferenceSafeHandle git_reference_set_target(ReferenceSafeHandle r
{
GitOid oid = id.Oid;
ReferenceSafeHandle ref_out;
-
+
int res = NativeMethods.git_reference_set_target(out ref_out, reference, ref oid);
Ensure.ZeroResult(res);
View
1  LibGit2Sharp/Core/RawContentStream.cs
@@ -28,4 +28,3 @@ protected override void Dispose(bool disposing)
}
}
}
-
Please sign in to comment.
Something went wrong with that request. Please try again.