diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-30 19:14:47 +0100 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-30 19:14:47 +0100 |
commit | 2d5b60bbbdf1a43d0271f352a0d5f536796002c9 (patch) | |
tree | 64e46c965ef66de48764ebe7ef7f1b00f38ad7f4 /tests.branching/setup | |
parent | b76d00c7a1e07267b8db214e344e4e9b293e5287 (diff) | |
download | morph-2d5b60bbbdf1a43d0271f352a0d5f536796002c9.tar.gz |
Add test for branching off not from master
Diffstat (limited to 'tests.branching/setup')
-rwxr-xr-x | tests.branching/setup | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests.branching/setup b/tests.branching/setup index 68117fa3..261e7142 100755 --- a/tests.branching/setup +++ b/tests.branching/setup @@ -74,6 +74,9 @@ 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 +touch "$DATADIR/morphs/this.is.alfred" +scripts/run-git-in "$DATADIR/morphs" add this.is.alfred +scripts/run-git-in "$DATADIR/morphs" commit --quiet -m 'mark as alfred' scripts/run-git-in "$DATADIR/morphs" checkout master |