skip unecessary merge in dist process
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
parent
2b22bfc0db
commit
f8b20d5854
1 changed files with 10 additions and 6 deletions
4
build
4
build
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue