We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent d1b7eb8 commit 19b715dCopy full SHA for 19b715d
.github/workflows/update-subtree.yml
@@ -153,6 +153,7 @@ jobs:
153
- name: Merge subtree/library changes
154
if: ${{ env.MERGE_CONFLICTS != 'noop' && env.MERGE_PR_EXISTS == 'no' }}
155
run: |
156
+ set -vx
157
cd verify-rust-std
158
if ! git rev-parse --verify subtree/library; then
159
git checkout -t -b subtree/library origin/update-subtree/library
@@ -162,6 +163,7 @@ jobs:
162
163
# Tell git about the correct merge base to use, which is the subtree
164
# head that we last merged from.
165
PREV_SUBTREE_HEAD=$(git log --grep="^git-subtree-split:" | egrep '^[[:space:]]+git-subtree-split:' | awk '{print $2;exit}')
166
+ echo "Previous subtree head: ${PREV_SUBTREE_HEAD}"
167
git replace --graft subtree/library ${PREV_SUBTREE_HEAD}
168
git replace --graft main ${PREV_SUBTREE_HEAD}
169
0 commit comments