From be1920dc4633ab07363284cb3bb5de1980f626ee Mon Sep 17 00:00:00 2001 From: Akos Kiss Date: Fri, 19 Feb 2016 09:36:05 +0100 Subject: [PATCH] Fix tools/check-signed-off.sh to handle PRs not based on HEAD JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu --- tools/check-signed-off.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/check-signed-off.sh b/tools/check-signed-off.sh index df7f0b15ef..1423885cc3 100755 --- a/tools/check-signed-off.sh +++ b/tools/check-signed-off.sh @@ -22,13 +22,7 @@ then commit_hash=`git show -s --format=%h HEAD | head -1` elif [ "${#parent_hashes[@]}" -eq 2 ] then - if git merge-base --is-ancestor "${parent_hashes[@]}" - then - commit_hash=${parent_hashes[1]} - else - echo "$0: cannot handle merge commit where first parent ${parent_hashes[0]} is not ancestor of second parent ${parent_hashes[1]}" - exit 1 - fi + commit_hash=${parent_hashes[1]} else echo "$0: cannot handle commit with ${#parent_hashes[@]} parents ${parent_hashes[@]}" exit 1