aormsby/Fork-Sync-With-Upstream-action
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #85 from Shinku-Chen/fix/rev-list-branch-dir-ambiguity

Browse Source 
fix: resolve ambiguous git rev-list when branch name collides with a directory
This commit is contained in:
Adam Ormsby
2026-09-02 22:14:47 -07:00
committed by GitHub
parent 83d78e8c4b 66925e8bb3
commit 3863de47aa
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
run/get_updates.sh
+4 -2
View File
@@ -52,8 +52,10 @@ set_out_put() {
find_last_synced_commit() {
LAST_SYNCED_COMMIT=""
TARGET_BRANCH_LOG="$(git rev-list "${INPUT_TARGET_SYNC_BRANCH}")"
UPSTREAM_BRANCH_LOG="$(git rev-list "upstream/${INPUT_UPSTREAM_SYNC_BRANCH}")"
# `--` separates revisions from paths so a branch whose name collides with a
# tracked path (e.g. `main` vs the `main/` firmware dir) is not ambiguous.
TARGET_BRANCH_LOG="$(git rev-list "${INPUT_TARGET_SYNC_BRANCH}" --)"
UPSTREAM_BRANCH_LOG="$(git rev-list "upstream/${INPUT_UPSTREAM_SYNC_BRANCH}" --)"
for hash in ${TARGET_BRANCH_LOG}; do
UPSTREAM_CHECK="$(echo "${UPSTREAM_BRANCH_LOG}" | grep "${hash}")"