RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-22 20:32:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: scripts: make publish-release support bare repositories

Browse Source 
First we must not report an error when "git diff HEAD" fails. Second, we
don't want to "cd" to the home dir when "git rev-parse --show-toplevel"
returns an empty string. Third, we definitely want to check that a master
branch really exists in the current directory to avoid mistakes.
This commit is contained in:
Willy Tarreau 2017-06-09 15:36:02 +02:00
parent b286fffa42
commit 600cb57450
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/publish-release
View File

@ -64,13 +64,21 @@ if ! git rev-parse --verify -q HEAD >/dev/null; then
fi
# we want to go to the git top dir
cd $(git rev-parse --show-toplevel)
toplvl=$(git rev-parse --show-toplevel)
if [ -n "$toplvl" ]; then
cd "$toplvl"
fi
# ensure that a master branch exists here
if [ -z "$(git rev-parse --verify -q master 2>/dev/null)" ]; then
die "Current directory doesn't seem to be a valid git directory (no master branch)."
fi
if [ "$(git rev-parse --verify -q HEAD)" != "$(git rev-parse --verify -q master)" ]; then
die "git HEAD doesn't match master branch."
fi
if [ "$(git diff HEAD|wc -c)" != 0 ]; then
if [ "$(git diff HEAD 2>/dev/null |wc -c)" != 0 ]; then
err "You appear to have uncommitted local changes, please commit them first :"
git status -s -uno >&2
die