完成更多方法

lindexi · May 11, 2024 · a0e77f1 · a0e77f1
1 parent 8b95e73
commit a0e77f1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/package/GitCommand/GitCommand.Tests/GitTest.cs b/package/GitCommand/GitCommand.Tests/GitTest.cs
@@ -1,7 +1,10 @@
 using System.IO;
 using System.Threading;
+
 using Lindexi.Src.GitCommand;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 using MSTest.Extensions.Contracts;
 
 namespace GitCommand.Tests
@@ -44,5 +47,16 @@ public void GetCurrentCommit()
                 Assert.AreEqual(false, currentCommit.Contains('\n'));
             });
         }
+
+        [ContractTestCase]
+        public void GetGitCommitRevisionCount()
+        {
+            "获取当前的 git 的 commit 数量，可以获取成功".Test(() =>
+            {
+                var git = new Git(new DirectoryInfo("."));
+                var count = git.GetGitCommitRevisionCount();
+                Assert.AreNotEqual(0, count);
+            });
+        }
     }
 }
diff --git a/package/GitCommand/GitCommand/Git.cs b/package/GitCommand/GitCommand/Git.cs
@@ -69,6 +69,12 @@ public string[] GetLogCommit()
         public string GetCurrentCommit()
         {
             var (success, output) = ExecuteCommand("rev-parse HEAD");
+
+            if (!success)
+            {
+                return string.Empty;
+            }
+
             return output.Trim('\n');
         }
 
@@ -78,10 +84,14 @@ public string GetCurrentCommit()
         /// <returns></returns>
         public int GetGitCommitRevisionCount()
         {
-            var control = Control("rev-list --count HEAD");
-            var str = control.Split("\n", StringSplitOptions.RemoveEmptyEntries).Select(temp => temp.Replace("\r", "")).Where(temp => !string.IsNullOrEmpty(temp)).Reverse().FirstOrDefault();
+            var (success, output) = ExecuteCommand("rev-list --count HEAD");
+
+            if (!success)
+            {
+                return -1;
+            }
 
-            if (int.TryParse(str, out var count))
+            if (int.TryParse(output, out var count))
             {
                 return count;
             }
@@ -452,6 +462,14 @@ public string GetCurrentBranch()
                 exitCode = errorList.Count > 0 ? -1 : 0;
             }
 
+            if (outputList.Count > 0)
+            {
+                if (outputList[^1] is null)
+                {
+                    outputList.RemoveAt(outputList.Count - 1);
+                }
+            }
+
             var output = string.Join('\n', outputList);
             return (exitCode == 0, output);
         }