diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-26 14:43:51 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-26 14:43:51 +0100 |
| commit | 0d202c2370201195d0ac5b930027a7fbcdc16cd5 (patch) | |
| tree | 2911f69296c01aa4b135711a2dc7a8542ec2191d /tests.branching/setup | |
| parent | f171b6b27ac8d3bb7235d409cb2510516cf66b8f (diff) | |
| download | morph-0d202c2370201195d0ac5b930027a7fbcdc16cd5.tar.gz | |
Change "checkout existing branch" test to not check out master
Checking out another branch exposed a bunch of bugs.
Diffstat (limited to 'tests.branching/setup')
| -rwxr-xr-x | tests.branching/setup | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests.branching/setup b/tests.branching/setup index 791e0337..68117fa3 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -72,6 +72,11 @@ scripts/run-git-in "$DATADIR/morphs" add . scripts/run-git-in "$DATADIR/morphs" commit -m initial +# Add an extra branch to the morphs repo. +scripts/run-git-in "$DATADIR/morphs" checkout -b alfred +scripts/run-git-in "$DATADIR/morphs" checkout master + + # Create a dummy chunk repository mkdir "$DATADIR/hello" @@ -87,3 +92,8 @@ scripts/run-git-in "$DATADIR/hello" init scripts/run-git-in "$DATADIR/hello" add . scripts/run-git-in "$DATADIR/hello" commit -m initial + +# Add an extra branch to the hello repo. +scripts/run-git-in "$DATADIR/hello" checkout -b alfred +scripts/run-git-in "$DATADIR/hello" checkout master + |