Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
halms authored Mar 18, 2024
1 parent bc431b2 commit c61731f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-branch-linearity.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ git fetch origin $TARGET_BRANCH 2> /dev/null


# Detection of (PR) merge commits at tip of HEAD:
target_sha=$(git rev-parse $TARGET_BRANCH)
target_sha=$(git rev-parse origin/${TARGET_BRANCH})
# Get SHA of parent commit
merge_target=$(git log --merges --oneline --parents --no-abbrev-commit HEAD^..HEAD | cut -d" " -f2)
# If parent is the target branch, start from the commit before the merge commit
Expand Down

0 comments on commit c61731f

Please sign in to comment.