diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2019-12-15 22:22:12 -0800 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2019-12-15 22:22:12 -0800 |
| commit | fcff62262703554ccebdda353f5435aeb6162834 (patch) | |
| tree | f7dc3987dd25a2e17980e74842a820bbbc21c069 /local/update-03-filename | |
| parent | local: autofixing from shellcheck (diff) | |
| download | githooks-fcff62262703554ccebdda353f5435aeb6162834.tar.gz githooks-fcff62262703554ccebdda353f5435aeb6162834.tar.bz2 githooks-fcff62262703554ccebdda353f5435aeb6162834.zip | |
local: resync from git-gx86-tools/49b86a7418e68de3cf90ec88add3ac08630b7f0b, need to redo local commits
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'local/update-03-filename')
| -rwxr-xr-x | local/update-03-filename | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/local/update-03-filename b/local/update-03-filename index 6871175..da2c8ff 100755 --- a/local/update-03-filename +++ b/local/update-03-filename @@ -1,5 +1,4 @@ #!/bin/bash -# gentoo-infra: infra/githooks.git:local/update-03-filename # Copyright 2015-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 or later @@ -12,17 +11,6 @@ newrev=$3 # skip non-master commits [[ ${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 - # Filenames must contain only the characters [A-Za-z0-9._+-] and must # not begin with a dot, a hyphen, or a plus sign. # https://devmanual.gentoo.org/general-concepts/tree/#what-belongs-in-the-tree%3F |