diff options
Diffstat (limited to 'local/update-05-manifest')
| -rwxr-xr-x | local/update-05-manifest | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/local/update-05-manifest b/local/update-05-manifest index 4649fc3..42afd2a 100755 --- a/local/update-05-manifest +++ b/local/update-05-manifest @@ -1,5 +1,4 @@ #!/bin/bash -# gentoo-infra: infra/githooks.git:local/update-05-manifest # Copyright 2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 or later @@ -14,17 +13,6 @@ 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 |