diff options
Diffstat (limited to 'local/update-05-manifest')
| -rwxr-xr-x | local/update-05-manifest | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/local/update-05-manifest b/local/update-05-manifest index 2dda5c7..4649fc3 100755 --- a/local/update-05-manifest +++ b/local/update-05-manifest @@ -14,6 +14,17 @@ export LC_MESSAGES=C # enforce only on master branch [[ ${refname} == refs/heads/master ]] || exit 0 +# special cases +zeros=0000000000000000000000000000000000000000 +# branch removal +[[ ${newrev} == "${zeros}" ]] && exit 0 +# new branch; try to find a merge base with master +if [[ ${oldrev} == "${zeros}" && ${refname} != refs/heads/master ]]; then + mergebase=$(git merge-base refs/heads/master "${newrev}") + [[ -n ${mergebase} ]] && oldrev=${mergebase} + [[ -z ${mergebase} ]] && echo "WARNING: No common commits with master!" +fi + ret=0 while read commithash; do # check for any Manifest changes |