Skip to content

Commit e241b93

Browse files
authored
update-dmd-rewrite.sh: Work around filter-repo weirdness (#4788)
The default replacement of commit refs from original to rewritten hash seems to hick up occasionally for one commit, not always replacing the original hash. I've now hit this two or three times for a recent-ish DMD master commit, which was cherry-picked to stable upstream. Replace the hash manually to the correct one (in our dmd-rewrite-master branch).
1 parent 64dd9c0 commit e241b93

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

tools/update-dmd-rewrite.sh

+5-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ temp_dir="$(mktemp -d)"
2323
cd "$temp_dir"
2424

2525
# generate message-filters.txt file for replacing GitHub refs in commit messages
26-
echo 'regex:(^|\s|\()#(\d{2,})==>\1dlang/dmd!\2' > message-filters.txt
26+
cat > message-filters.txt <<'EOF'
27+
regex:(^|\s|\()#(\d{2,})==>\1dlang/dmd!\2
28+
(cherry picked from commit 88d1e8fc37428b873f59d87f8dff1f40fbd3e7a3)==>(cherry picked from commit 8b9b481a322bdcbfdad38ba4ad74182742aef118)
29+
EOF
2730

2831
# clone DMD monorepo
2932
git clone [email protected]:dlang/dmd.git dmd.tmp
@@ -104,7 +107,7 @@ if [[ "$initialize" != 1 ]]; then
104107
fi
105108

106109
# push prefixed master/stable branches and tags
107-
git push --tags ldc "${refs_prefix}master" "${refs_prefix}stable"
110+
git push --tags --atomic ldc "${refs_prefix}master" "${refs_prefix}stable"
108111

109112
cd ../..
110113
rm -rf "$temp_dir"

0 commit comments

Comments
 (0)