Skip to content

Switch to target branch #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tresf merged 2 commits into from
Feb 19, 2017
Merged

Switch to target branch #214

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e561eb9
Switch to target branch
Feb 16, 2017
bf829c6
Disable test to allow merge
Feb 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Switch to target branch
  • Loading branch information
Javier Serrano Polo committed Feb 16, 2017
commit e561eb9b971ee198bc83f4bcfa3573da3ea6fecc
5 changes: 4 additions & 1 deletion cron/git_maintenance_tasks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ set -e

BRANCH=master
BRANCH=maintenance-test
BRANCH=maintenance-test2

DIR="$(readlink -e "$(dirname $0)")"

Expand All @@ -15,7 +16,9 @@ cd ~/lmms-repo
if [ -e lmms ]
then
cd lmms
PULLRES=$(git pull)
git fetch
git checkout "$BRANCH"
PULLRES=$(git merge origin/"$BRANCH")
if [ "$PULLRES" = "Already up-to-date." -a -e maintenance-tasks-done ]
then
exit
Expand Down