Skip to content

Commit

Permalink
Move git fetch --all earlier
Browse files Browse the repository at this point in the history
  • Loading branch information
willhickey committed Mar 11, 2024
1 parent 22a01f2 commit c1f182c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/cherry-pick-from-branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# In a repo
# $DEST_REPO/$DEST_BRANCH is defined, readable, and writeable
# $BEFORE_SHA..$LAST_SHA must define a sequence of commits
# fetch all has just been run

DEST_REMOTE=$1
DEST_BRANCH=$2
Expand All @@ -21,7 +22,7 @@ SKIP_COMMIT_STRING="DO NOT SYNC"
# TODO Maybe don't need these? I think the identity of the PAT is overriding them anyway
# git config --global user.email "[email protected]"
# git config --global user.name "GHA: Update Upstream From Fork" #TODO better name
git fetch --all
# git fetch --all
echo "-------------------------"
echo "git log --oneline remotes/$DEST_REMOTE/$DEST_BRANCH:"
git log --oneline "remotes/$DEST_REMOTE/$DEST_BRANCH"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/update_upstream_from_fork.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
shell: bash
- name: show remotes and branches
run: |
git fetch --all
git remote --verbose
git branch --all
git log --oneline "origin/$BRANCH_REF"
Expand Down

0 comments on commit c1f182c

Please sign in to comment.