diff options
Diffstat (limited to 'local/update-04-utf8')
| -rwxr-xr-x | local/update-04-utf8 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/local/update-04-utf8 b/local/update-04-utf8 index 8195931..3d2f9f3 100755 --- a/local/update-04-utf8 +++ b/local/update-04-utf8 @@ -10,6 +10,17 @@ newrev=$3 export LC_MESSAGES=C +# 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 # verify that the commit object (including author, committer, commit |