Update on Command.Pull but it does not work as expected actually.

Author: igadmg

Diff for: LibGit2Sharp/Commands/Pull.cs

@@ -15,13 +15,11 @@ public static partial class Commands
         /// <param name="repository">The repository.</param>
         /// <param name="merger">The signature to use for the merge.</param>
         /// <param name="options">The options for fetch and merging.</param>
-        public static MergeResult Pull(Repository repository, Signature merger, PullOptions options)
+        public static MergeResult Pull(Repository repository, Signature merger, PullOptions options = null)
         {
             Ensure.ArgumentNotNull(repository, "repository");
-            Ensure.ArgumentNotNull(merger, "merger");
 
 
-            options = options ?? new PullOptions();
             Branch currentBranch = repository.Head;
 
             if (!currentBranch.IsTracking)
@@ -34,7 +32,24 @@ public static MergeResult Pull(Repository repository, Signature merger, PullOpti
                 throw new LibGit2SharpException("No upstream remote for the current branch.");
             }
 
-            Commands.Fetch(repository, currentBranch.RemoteName, new string[0], options.FetchOptions, null);
+            return Pull(repository, currentBranch.RemoteName, merger, options);
+        }
+
+        /// <summary>
+        /// Fetch changes from the configured upstream remote and branch into the branch pointed at by HEAD.
+        /// </summary>
+        /// <param name="repository">The repository.</param>
+        /// <param name="remoteNameOrPath">The remote name or repository path.</param>
+        /// <param name="merger">The signature to use for the merge.</param>
+        /// <param name="options">The options for fetch and merging.</param>
+        public static MergeResult Pull(Repository repository, string remoteNameOrPath, Signature merger, PullOptions options = null)
+        {
+            Ensure.ArgumentNotNull(repository, "repository");
+            Ensure.ArgumentNotNull(merger, "merger");
+
+
+            options = options ?? new PullOptions();
+            Commands.Fetch(repository, remoteNameOrPath, new string[0], options.FetchOptions, null);
             return repository.MergeFetchedRefs(merger, options.MergeOptions);
         }
     }

Diff for: LibGit2Sharp/ContentChanges.cs

@@ -117,24 +117,24 @@ private unsafe int LineCallback(git_diff_delta* delta, GitDiffHunk hunk, GitDiff
                     break;
             }
 
-            AppendGitDiffLine(line);
+            AppendGitDiffLine(line, decodedContent);
             AppendToPatch(prefix);
             AppendToPatch(decodedContent);
             return 0;
         }
 
-        internal void AppendGitDiffLine(GitDiffLine line)
+        internal void AppendGitDiffLine(GitDiffLine line, string patch)
         {
             switch (line.lineOrigin)
             {
                 case GitDiffLineOrigin.GIT_DIFF_LINE_ADDITION:
-                    AddedLines.Add(new Line(line.NewLineNo, decodedContent));
+                    AddedLines.Add(new Line(line.NewLineNo, patch));
                     LinesAdded++;
                     lines.Add(new ContentChangeLine(line));
                     break;
 
                 case GitDiffLineOrigin.GIT_DIFF_LINE_DELETION:
-                    DeletedLines.Add(new Line(line.OldLineNo, decodedContent));
+                    DeletedLines.Add(new Line(line.OldLineNo, patch));
                     LinesDeleted++;
                     lines.Add(new ContentChangeLine(line));
                     break;

Diff for: LibGit2Sharp/Patch.cs

@@ -85,7 +85,7 @@ private unsafe int PrintCallBack(git_diff_delta* delta, GitDiffHunk hunk, GitDif
                     break;
             }
 
-            currentChange.AppendGitDiffLine(line);
+            currentChange.AppendGitDiffLine(line, patchPart);
 
             string formattedOutput = string.Concat(prefix, patchPart);