ignore merges when generting history

closes #258
majkinetor · Jan 13, 2022 · e14bb59 · e14bb59
1 parent d903205
commit e14bb59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/AU/Plugins/History.ps1 b/AU/Plugins/History.ps1
@@ -26,7 +26,7 @@ param(
 Write-Host "Saving history to $Path"
 
 $res=[System.Collections.Specialized.OrderedDictionary]@{}
-$log = git --no-pager log -q --grep '^AU: ' --date iso --all | Out-String
+$log = git --no-pager --no-merges log -q --grep '^AU: ' --date iso --all | Out-String
 $all_commits = $log | Select-String 'commit(.|\n)+?(?=\ncommit )' -AllMatches
 foreach ($commit in $all_commits.Matches.Value) {
     $commit = $commit -split '\n'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
   - `$au_GalleryUrl` global variable is still maintained for compatibility
   - Can specify as an environment variable `$env:au_GalleryPackageRootUrl` when working with Update-AUPackages (update_all.ps1) ([#254](https://github.com/majkinetor/au/issues/254))
   - Can specify as a global variable in update.ps1 to override on per package basis.
+- Plugins:
+    - History plugin now ignores merges ([#258](https://github.com/majkinetor/au/issues/258))
 
 ## 2021.7.18