marcoduif/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests 1 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
commit f8b20d5854
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build
View file

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