From c6fbcd78b60962069a18e73bf602946af452cf5a Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Tue, 23 Jun 2026 14:51:01 +0200 Subject: [PATCH] feat(merge-git-remote): use temporary refs to avoid conflicts during fetch --- bin/merge-git-remote | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/merge-git-remote b/bin/merge-git-remote index 7c82222..2639e03 100755 --- a/bin/merge-git-remote +++ b/bin/merge-git-remote @@ -42,10 +42,10 @@ merge-git-remote() { key=$(echo "$line" | awk '{print $1}') merge_ref=$(echo "$line" | awk '{print $2}') remote_name="${key##merge.$git_folder.}" + tmp_ref="refs/merge-tmp/${remote_name}-$(echo "$merge_ref" | tr '/' '-')" echo "Fetch ref $merge_ref from $remote_name" - git -C "$git_folder" fetch "$remote_name" "$merge_ref:$merge_ref" - + git -C "$git_folder" fetch "$remote_name" "$merge_ref:$tmp_ref" done < <(git config -f .gitmodules --get-regexp "merge\.$git_folder\.") # Merge refs into merge branch