romain-dartigues/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

skip unecessary merge in dist process

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-10-31 08:18:02 +01:00
parent 2b22bfc0db
commit f8b20d5854
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
build
View file

@ -168,12 +168,16 @@ notes
target_branch=${version%\.*} target_branch=${version%\.*}
current_branch=$(git rev-parse --abbrev-ref HEAD) current_branch=$(git rev-parse --abbrev-ref HEAD)
printf "Press enter to git merge $current_branch into \"$target_branch\" > " if [ "$target_branch" = "$current_branch" ]; then
read prompt echo "Skipping merge, already on destination branch"
git checkout "$target_branch" else
git merge "$current_branch" printf "Press enter to git merge $current_branch into \"$target_branch\" > "
git checkout "$current_branch" read prompt
;; git checkout "$target_branch"
git merge "$current_branch"
git checkout "$current_branch"
fi
;;
dist-archlinux) dist-archlinux)
./PKGBUILD.in ./PKGBUILD.in