Skip to content

Commit 19b715d

Browse files
committed
DEBUG
1 parent d1b7eb8 commit 19b715d

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

.github/workflows/update-subtree.yml

+2
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ jobs:
153153
- name: Merge subtree/library changes
154154
if: ${{ env.MERGE_CONFLICTS != 'noop' && env.MERGE_PR_EXISTS == 'no' }}
155155
run: |
156+
set -vx
156157
cd verify-rust-std
157158
if ! git rev-parse --verify subtree/library; then
158159
git checkout -t -b subtree/library origin/update-subtree/library
@@ -162,6 +163,7 @@ jobs:
162163
# Tell git about the correct merge base to use, which is the subtree
163164
# head that we last merged from.
164165
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}"
165167
git replace --graft subtree/library ${PREV_SUBTREE_HEAD}
166168
git replace --graft main ${PREV_SUBTREE_HEAD}
167169

0 commit comments

Comments
 (0)