Skip to content

Commit 4118bce

Browse files
authored
Fix error on git rev-list (#1528)
Error: `fatal: ambiguous argument 'main': both revision and filename` means that there is both a branch named _main_ and a file or a directory, named _main_. Fixes #1526
1 parent e8d11e0 commit 4118bce

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Actions/CheckForUpdates/CheckForUpdates.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ else {
212212
# $update set, update the files
213213
try {
214214
# If a pull request already exists with the same REF, then exit
215-
$branchSHA = RunAndCheck git rev-list -n 1 $updateBranch
215+
$branchSHA = RunAndCheck git rev-list -n 1 $updateBranch '--'
216216
$commitMessage = "[$($updateBranch)@$($branchSHA.SubString(0,7))] Update AL-Go System Files from $templateInfo - $($templateSha.SubString(0,7))"
217217

218218
# Get Token with permissions to modify workflows in this repository

RELEASENOTES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
- Issue 1521 Dependencies not installed for multi project incremental PR build
55
- Issue 1522 Strange warnings in Deploy job post update to AL-Go 6.4
66
- BcContainerHelper settings were only read from .github/AL-Go-Settings.json, not allowing global settings in ALGoOrgSettings for TrustedNuGetFeeds, MemoryLimit and other things that should be possible to define globally
7+
- Issue 1526 When updating AL-Go system files, the update process (creating a PR or directly pushing to the branch) fails when there is a file or directory in the repo with the same name as the branch that is to be updated
78

89
## v6.4
910

0 commit comments

Comments
 (0)