AFE_SZ_DEV/agent-skills
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(git-control): show commit author in branch compare, add by-user summary

Browse Source 
Made-with: Cursor
This commit is contained in:
man.zhong
2026-02-27 15:52:27 +08:00
parent f50d4ab4a3
commit 8e2afda170
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skills/git-control/SKILL.md
+1 -1
View File
@@ -100,7 +100,7 @@ Analyze differences between branches to find commits that need merging (e.g. pro
.\scripts\branch_compare.ps1 -RepoPath "d:\path\to\repo" -CompareSet full -SinceDate "2025-01-01"
```
**Output**: Commits in `HeadBranch` NOT in `BaseBranch` = need to merge (hotfixes). Commits in `BaseBranch` NOT in `HeadBranch` = base is ahead (normal).
**Output**: Each line shows `hash | author | message`. When there are unmerged commits, a "By user (unmerged)" summary lists each user and their commit count.
### 7. Org-Wide User Access
skills/git-control/scripts/branch_compare.ps1
+24 -3
View File
@@ -26,7 +26,7 @@ if (-not $ApiToken -and (Test-Path $ConfigPath)) {
function Get-GitLog {
param([string]$Path, [string]$Range, [string]$Since)
$gitArgs = @("log", $Range, "--oneline", "--no-merges")
$gitArgs = @("log", $Range, "--no-merges", "--format=%h | %an | %s")
if ($Since) { $gitArgs += "--since=$Since" }
$out = & git -C $Path $gitArgs 2>&1
if ($out) { $out } else { @() }
@@ -65,6 +65,13 @@ function Compare-Local {
Write-Host " Total: $($inBaseNotHead.Count) commits" -ForegroundColor Gray
}
if ($inHeadNotBase.Count -gt 0) {
$byUser = $inHeadNotBase | ForEach-Object {
$parts = $_ -split '\s*\|\s*'
if ($parts.Count -ge 2) { $parts[1].Trim() }
} | Where-Object { $_ } | Group-Object | Sort-Object Count -Descending
Write-Host ""
Write-Host "By user (unmerged):" -ForegroundColor Yellow
$byUser | ForEach-Object { Write-Host " $($_.Name): $($_.Count) commits" }
Write-Host ""
Write-Host "ACTION: Merge ${HeadBranch} into ${BaseBranch} to sync hotfixes." -ForegroundColor Red
}
@@ -86,7 +93,11 @@ function Compare-API {
if ($commits.Count -eq 0) {
Write-Host " (none)" -ForegroundColor Green
} else {
$commits | ForEach-Object { Write-Host " $($_.sha.Substring(0,7)) $($_.commit.message.Split("`n")[0])" }
$commits | ForEach-Object {
$author = $_.commit.author.name
if ($_.author.login) { $author = $_.author.login }
Write-Host " $($_.sha.Substring(0,7)) | $author | $($_.commit.message.Split("`n")[0])"
}
Write-Host " Total: $($commits.Count) commits" -ForegroundColor Yellow
}
Write-Host ""
@@ -97,10 +108,20 @@ function Compare-API {
if ($commitsRev.Count -eq 0) {
Write-Host " (none)" -ForegroundColor Gray
} else {
$commitsRev | ForEach-Object { Write-Host " $($_.sha.Substring(0,7)) $($_.commit.message.Split("`n")[0])" }
$commitsRev | ForEach-Object {
$author = $_.commit.author.name
if ($_.author.login) { $author = $_.author.login }
Write-Host " $($_.sha.Substring(0,7)) | $author | $($_.commit.message.Split("`n")[0])"
}
Write-Host " Total: $($commitsRev.Count) commits" -ForegroundColor Gray
}
if ($commits.Count -gt 0) {
$byUser = $commits | ForEach-Object {
if ($_.author.login) { $_.author.login } else { $_.commit.author.name }
} | Group-Object | Sort-Object Count -Descending
Write-Host ""
Write-Host "By user (unmerged):" -ForegroundColor Yellow
$byUser | ForEach-Object { Write-Host " $($_.Name): $($_.Count) commits" }
Write-Host ""
Write-Host "ACTION: Merge ${HeadBranch} into ${BaseBranch} to sync hotfixes." -ForegroundColor Red
}