Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Set correct Commit ID from origin instead of local

Browse Source
This commit is contained in:
DerLinkman 2022-08-24 16:12:36 +02:00
parent 85deeaf806
commit e202530afb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
update.sh
View File

@ -730,7 +730,7 @@ elif [ $NEW_BRANCH == "nightly" ] && [ $CURRENT_BRANCH != "nightly" ]; then
git diff ${BRANCH} --stat > ${DIFF_FILE} git diff ${BRANCH} --stat > ${DIFF_FILE}
git diff ${BRANCH} >> ${DIFF_FILE} git diff ${BRANCH} >> ${DIFF_FILE}
fi fi
git fetch origin git fetch origin --all
git checkout -f ${BRANCH} git checkout -f ${BRANCH}
fi fi
@ -872,14 +872,14 @@ fi
if [ ${BRANCH} == "master" ]; then if [ ${BRANCH} == "master" ]; then
mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`) mailcow_git_version=$(git describe --tags `git rev-list --tags --max-count=1`)
elif [ ${BRANCH} == "nightly" ]; then elif [ ${BRANCH} == "nightly" ]; then
mailcow_git_version=$(git rev-parse --short HEAD) mailcow_git_version=$(git rev-parse origin/${BRANCH} --short HEAD | head -2 | tail -1)
mailcow_last_git_version="" mailcow_last_git_version=""
else else
mailcow_git_version=$(git rev-parse --short HEAD) mailcow_git_version=$(git rev-parse --short HEAD)
mailcow_last_git_version="" mailcow_last_git_version=""
fi fi
mailcow_git_commit=$(git rev-parse HEAD) mailcow_git_commit=$(git rev-parse origin/${BRANCH})
mailcow_git_commit_date=$(git show -s --format=%cd --date=format:'%Y-%m-%d %H:%M') mailcow_git_commit_date=$(git show -s --format=%cd --date=format:'%Y-%m-%d %H:%M')
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@ -928,8 +928,8 @@ if [ -f "${SCRIPT_DIR}/post_update_hook.sh" ]; then
bash "${SCRIPT_DIR}/post_update_hook.sh" bash "${SCRIPT_DIR}/post_update_hook.sh"
fi fi
# echo "In case you encounter any problem, hard-reset to a state before updating mailcow:" echo "In case you encounter any problem, hard-reset to a state before updating mailcow:"
# echo echo
# git reflog --color=always | grep "Before update on " git reflog --color=always | grep "Before update on "
# echo echo
# echo "Use \"git reset --hard hash-on-the-left\" and run $COMPOSE_COMMAND up -d afterwards." echo "Use \"git reset --hard hash-on-the-left\" and run $COMPOSE_COMMAND up -d afterwards."