Skip to content

Commit be1920d

Browse files
committed
Fix tools/check-signed-off.sh to handle PRs not based on HEAD
JerryScript-DCO-1.0-Signed-off-by: Akos Kiss [email protected]
1 parent 5afc060 commit be1920d

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

tools/check-signed-off.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,7 @@ then
2222
commit_hash=`git show -s --format=%h HEAD | head -1`
2323
elif [ "${#parent_hashes[@]}" -eq 2 ]
2424
then
25-
if git merge-base --is-ancestor "${parent_hashes[@]}"
26-
then
27-
commit_hash=${parent_hashes[1]}
28-
else
29-
echo "$0: cannot handle merge commit where first parent ${parent_hashes[0]} is not ancestor of second parent ${parent_hashes[1]}"
30-
exit 1
31-
fi
25+
commit_hash=${parent_hashes[1]}
3226
else
3327
echo "$0: cannot handle commit with ${#parent_hashes[@]} parents ${parent_hashes[@]}"
3428
exit 1

0 commit comments

Comments
 (0)