enhance: create branch on detached HEAD (#344)

love-linger · love-linger · commit ed2d3279e16d · 2024-08-09T16:06:28.000+08:00
diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
@@ -39,7 +39,7 @@ protected override void OnReadline(string line)
 
             if (refName.StartsWith(PREFIX_DETACHED, StringComparison.Ordinal))
             {
-                branch.IsHead = true;
+                branch.IsDetachedHead = true;
             }
 
             if (refName.StartsWith(PREFIX_LOCAL, StringComparison.Ordinal))
diff --git a/src/Models/Branch.cs b/src/Models/Branch.cs
@@ -28,10 +28,10 @@ public class Branch
         public string Head { get; set; }
         public bool IsLocal { get; set; }
         public bool IsCurrent { get; set; }
+        public bool IsDetachedHead { get; set; }
         public string Upstream { get; set; }
         public BranchTrackStatus TrackStatus { get; set; }
         public string Remote { get; set; }
-        public bool IsHead { get; set; }
 
         public string FriendlyName => IsLocal ? Name : $"{Remote}/{Name}";
     }
diff --git a/src/ViewModels/BranchTreeNode.cs b/src/ViewModels/BranchTreeNode.cs
@@ -189,7 +189,7 @@ private void SortNodes(List<BranchTreeNode> nodes)
             {
                 nodes.Sort((l, r) =>
                 {
-                    if (l.Backend is Models.Branch { IsHead: true })
+                    if (l.Backend is Models.Branch { IsDetachedHead: true })
                         return -1;
 
                     if (l.Backend is Models.Branch)
diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs
@@ -35,7 +35,7 @@ public bool CheckoutAfterCreated
         public CreateBranch(Repository repo, Models.Branch branch)
         {
             _repo = repo;
-            _baseOnRevision = branch.FullName;
+            _baseOnRevision = branch.IsDetachedHead ? branch.Head : branch.FullName;
 
             if (!branch.IsLocal && repo.Branches.Find(x => x.IsLocal && x.Name == branch.Name) == null)
             {
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -746,7 +746,7 @@ public void RefreshCommits()
             }
             else
             {
-                limits += "--branches --remotes --tags";
+                limits += "--exclude=refs/stash --all";
             }
 
             var commits = new Commands.QueryCommits(_fullpath, limits).Result();

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ protected override void OnReadline(string line)`
`39`	`39`
`40`	`40`	`if (refName.StartsWith(PREFIX_DETACHED, StringComparison.Ordinal))`
`41`	`41`	`{`
`42`		`- branch.IsHead = true;`
	`42`	`+ branch.IsDetachedHead = true;`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`if (refName.StartsWith(PREFIX_LOCAL, StringComparison.Ordinal))`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ private void SortNodes(List<BranchTreeNode> nodes)`
`189`	`189`	`{`
`190`	`190`	`nodes.Sort((l, r) =>`
`191`	`191`	`{`
`192`		`- if (l.Backend is Models.Branch { IsHead: true })`
	`192`	`+ if (l.Backend is Models.Branch { IsDetachedHead: true })`
`193`	`193`	`return -1;`
`194`	`194`
`195`	`195`	`if (l.Backend is Models.Branch)`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public bool CheckoutAfterCreated`
`35`	`35`	`public CreateBranch(Repository repo, Models.Branch branch)`
`36`	`36`	`{`
`37`	`37`	`_repo = repo;`
`38`		`- _baseOnRevision = branch.FullName;`
	`38`	`+ _baseOnRevision = branch.IsDetachedHead ? branch.Head : branch.FullName;`
`39`	`39`
`40`	`40`	`if (!branch.IsLocal && repo.Branches.Find(x => x.IsLocal && x.Name == branch.Name) == null)`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@ public void RefreshCommits()`
`746`	`746`	`}`
`747`	`747`	`else`
`748`	`748`	`{`
`749`		`- limits += "--branches --remotes --tags";`
	`749`	`+ limits += "--exclude=refs/stash --all";`
`750`	`750`	`}`
`751`	`751`
`752`	`752`	`var commits = new Commands.QueryCommits(_fullpath, limits).Result();`