STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use verbose upstream setting

Browse source
This commit is contained in:
William Martin 2025-03-13 14:59:19 +01:00 • committed by Kynan Ware
parent 028caa3823
commit ebd147b43e
7 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
acceptance/testdata/pr/pr-create-respects-branch-pushremote.txtar vendored
View file

@ -33,7 +33,8 @@ exec gh repo clone ${USER}/${FORK}
cd ${FORK}
# Prepare a branch where changes are pulled from the upstream default branch but pushed to fork
exec git checkout -b feature-branch upstream/main
exec git checkout -b feature-branch
exec git branch --set-upstream-to upstream/main
exec git config branch.feature-branch.pushRemote origin
exec git config unset remote.upstream.gh-resolved
exec git commit --allow-empty -m 'Empty Commit'
@ -45,4 +46,4 @@ stdout https://${GH_HOST}/${ORG}/${REPO}/pull/1
# Assert that the PR was created with the correct head repository and refs
exec gh pr view --json headRefName,headRepository,baseRefName,isCrossRepository
stdout {"baseRefName":"main","headRefName":"feature-branch","headRepository":{"id":"${FORK_ID}","name":"${FORK}"},"isCrossRepository":true}
stdout {"baseRefName":"main","headRefName":"feature-branch","headRepository":{"id":"${FORK_ID}","name":"${FORK}"},"isCrossRepository":true}

5
acceptance/testdata/pr/pr-create-respects-remote-pushdefault.txtar vendored
View file

@ -33,7 +33,8 @@ exec gh repo clone ${USER}/${FORK}
cd ${FORK}
# Prepare a branch where changes are pulled from the upstream default branch but pushed to fork
exec git checkout -b feature-branch upstream/main
exec git checkout -b feature-branch
exec git branch --set-upstream-to upstream/main
exec git config remote.pushDefault origin
exec git config unset remote.upstream.gh-resolved
exec git commit --allow-empty -m 'Empty Commit'
@ -45,4 +46,4 @@ stdout https://${GH_HOST}/${ORG}/${REPO}/pull/1
# Assert that the PR was created with the correct head repository and refs
exec gh pr view --json headRefName,headRepository,baseRefName,isCrossRepository
stdout {"baseRefName":"main","headRefName":"feature-branch","headRepository":{"id":"${FORK_ID}","name":"${FORK}"},"isCrossRepository":true}
stdout {"baseRefName":"main","headRefName":"feature-branch","headRepository":{"id":"${FORK_ID}","name":"${FORK}"},"isCrossRepository":true}

3
acceptance/testdata/pr/pr-create-respects-simple-pushdefault.txtar vendored
View file

@ -20,7 +20,8 @@ cd ${REPO}
exec git config push.default simple
# Prepare a branch where changes are pulled from the default branch instead of remote branch of same name
exec git checkout -b feature-branch origin/main
exec git checkout -b feature-branch
exec git branch --set-upstream-to origin/main
exec git commit --allow-empty -m 'Empty Commit'
exec git push origin feature-branch

5
acceptance/testdata/pr/pr-create-respects-user-colon-branch-syntax.txtar vendored
View file

@ -33,7 +33,8 @@ exec gh repo clone ${USER}/${FORK}
cd ${FORK}
# Prepare a branch where changes are pulled from the upstream default branch but pushed to fork
exec git checkout -b feature-branch upstream/main
exec git checkout -b feature-branch
exec git branch --set-upstream-to upstream/main
exec git commit --allow-empty -m 'Empty Commit'
exec git push origin feature-branch
@ -43,4 +44,4 @@ stdout https://${GH_HOST}/${ORG}/${REPO}/pull/1
# Assert that the PR was created with the correct head repository and refs
exec gh pr view ${USER}:feature-branch --json headRefName,headRepository,baseRefName,isCrossRepository
stdout {"baseRefName":"main","headRefName":"feature-branch","headRepository":{"id":"${FORK_ID}","name":"${FORK}"},"isCrossRepository":true}
stdout {"baseRefName":"main","headRefName":"feature-branch","headRepository":{"id":"${FORK_ID}","name":"${FORK}"},"isCrossRepository":true}

3
acceptance/testdata/pr/pr-view-status-respects-branch-pushremote.txtar vendored
View file

@ -27,7 +27,8 @@ exec gh repo clone ${ORG}/${FORK}
cd ${FORK}
# Prepare a branch where changes are pulled from the upstream default branch but pushed to fork
exec git checkout -b feature-branch upstream/main
exec git checkout -b feature-branch
exec git branch --set-upstream-to upstream/main
exec git config branch.feature-branch.pushRemote origin
exec git commit --allow-empty -m 'Empty Commit'
exec git push

3
acceptance/testdata/pr/pr-view-status-respects-remote-pushdefault.txtar vendored
View file

@ -27,7 +27,8 @@ exec gh repo clone ${ORG}/${FORK}
cd ${FORK}
# Prepare a branch where changes are pulled from the upstream default branch but pushed to fork
exec git checkout -b feature-branch upstream/main
exec git checkout -b feature-branch
exec git branch --set-upstream-to upstream/main
exec git config remote.pushDefault origin
exec git commit --allow-empty -m 'Empty Commit'
exec git push

3
acceptance/testdata/pr/pr-view-status-respects-simple-pushdefault.txtar vendored
View file

@ -18,7 +18,8 @@ cd ${REPO}
exec git config push.default simple
# Prepare a branch where changes are pulled from the default branch instead of remote branch of same name
exec git checkout -b feature-branch origin/main
exec git checkout -b feature-branch
exec git branch --set-upstream-to origin/main
# Create the PR
exec git commit --allow-empty -m 'Empty Commit'