~ubuntu-xen-org/xcp/master

« back to all changes in this revision

Viewing changes to kronos-tools/create-ubuntu-branch.sh

  • Committer: Mike McClurg
  • Date: 2011-12-14 14:40:45 UTC
  • Revision ID: git-v1:a1b8abb49d504699787e84bc2286ab97889809bc
Check for remote ubuntu branch, and delete local ubuntu before bumping

Signed-off-by: Mike McClurg <mike.mcclurg@citrix.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
10
10
git fetch origin debian:debian
11
11
 
12
12
# Does ubuntu branch exist? Check it out and exit.
13
 
if [ `git branch | grep "ubuntu$"` ]; then
 
13
if [ `git branch -a | grep "remotes/origin/ubuntu$"` ]; then
14
14
        git checkout ubuntu
15
15
        exit 0
16
16
fi
17
17
 
18
 
# Ubuntu branch doesn't exist. Create it from debian and bump changelog.
 
18
# Ubuntu branch doesn't exist on remote. Delete any local ubuntu branch, create
 
19
# it from debian branch, and bump changelog.
 
20
git branch -D ubuntu || true
19
21
git branch ubuntu debian
20
22
git checkout ubuntu
21
23