1cabdff1aSopenharmony_ci#!/bin/sh 2cabdff1aSopenharmony_ci 3cabdff1aSopenharmony_ciif [ "$1" != "merge" -a "$1" != "noop" ]; then 4cabdff1aSopenharmony_ci printf "Usage: $0 <merge|noop [REF_HASH]>\n" 5cabdff1aSopenharmony_ci exit 0 6cabdff1aSopenharmony_cifi 7cabdff1aSopenharmony_ci 8cabdff1aSopenharmony_ci[ "$1" = "noop" ] && merge_opts="-s ours" 9cabdff1aSopenharmony_ci 10cabdff1aSopenharmony_cinextrev=$(git rev-list libav/master --not master --no-merges | tail -n1) 11cabdff1aSopenharmony_ciif [ -z "$nextrev" ]; then 12cabdff1aSopenharmony_ci printf "Nothing to merge..\n" 13cabdff1aSopenharmony_ci exit 0 14cabdff1aSopenharmony_cifi 15cabdff1aSopenharmony_ciprintf "Merging $(git log -n 1 --oneline $nextrev)\n" 16cabdff1aSopenharmony_cigit merge --no-commit $merge_opts --no-ff --log $nextrev 17cabdff1aSopenharmony_ci 18cabdff1aSopenharmony_ciif [ "$1" = "noop" -a -n "$2" ]; then 19cabdff1aSopenharmony_ci printf "\nThis commit is a noop, see $2\n" >> .git/MERGE_MSG 20cabdff1aSopenharmony_cifi 21cabdff1aSopenharmony_ci 22cabdff1aSopenharmony_ciprintf "\nMerged-by: $(git config --get user.name) <$(git config --get user.email)>\n" >> .git/MERGE_MSG 23