Skip to content

Commit

Permalink
Limit git log to 20 lines
Browse files Browse the repository at this point in the history
  • Loading branch information
willhickey committed Mar 15, 2024
1 parent de6ccf4 commit 7ac902a
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/update_upstream_from_fork.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# TODO Minimize the PAT permissions
# TODO Minimize the PAT permissions. Leave a comment about which are required.

name: Update Upstream From Fork

Expand Down Expand Up @@ -27,7 +27,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Echo git status
# TODO consolidate the status logging in the next few steps
run: |
echo "---------------"
echo "gh auth status"
Expand All @@ -54,11 +53,10 @@ jobs:
git fetch --all
git remote --verbose
git branch --all
git log --oneline "origin/$BRANCH_REF"
git log --oneline "remotes/upstream/$BRANCH_REF"
git log --oneline "origin/$BRANCH_REF" -20
git log --oneline "remotes/upstream/$BRANCH_REF" -20
shell: bash
- name: Cherry pick from origin to upstream
run: |
.github/workflows/cherry-pick-from-branch.sh upstream "$BRANCH_REF" "$BEFORE_SHA" "$LAST_SHA"
shell: bash

0 comments on commit 7ac902a

Please sign in to comment.