enhance: omit commit that is already cherry-picked from the target branch while querying commits for interactive-rebase (#1811)

love-linger · love-linger · commit 0ab4926ffeb7 · 2025-09-17T13:35:43.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Commands/QueryCommitsForInteractiveRebase.cs b/src/Commands/QueryCommitsForInteractiveRebase.cs
@@ -12,7 +12,7 @@ public QueryCommitsForInteractiveRebase(string repo, string on)
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"log --topo-order --right-only --max-parents=1 --no-show-signature --decorate=full --format=\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {on}..HEAD";
+            Args = $"log --topo-order --cherry-pick --right-only --no-merges --no-show-signature --decorate=full --format=\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {on}...HEAD";
         }
 
         public async Task<List<Models.InteractiveCommit>> GetResultAsync()

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public QueryCommitsForInteractiveRebase(string repo, string on)`
`12`	`12`
`13`	`13`	`WorkingDirectory = repo;`
`14`	`14`	`Context = repo;`
`15`		`- Args = $"log --topo-order --right-only --max-parents=1 --no-show-signature --decorate=full --format=\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {on}..HEAD";`
	`15`	`+ Args = $"log --topo-order --cherry-pick --right-only --no-merges --no-show-signature --decorate=full --format=\"%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%B%n{_boundary}\" {on}...HEAD";`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public async Task<List<Models.InteractiveCommit>> GetResultAsync()`