diff options
| author | scott Chacon <schacon@agadorsparticus.(none)> | 2007-11-11 14:37:05 -0800 |
|---|---|---|
| committer | scott Chacon <schacon@agadorsparticus.(none)> | 2007-11-11 14:37:05 -0800 |
| commit | b81ee9305f418209ba0d77fbb7b47b23d4b121ca (patch) | |
| tree | f4bef02a3befcbe06be85ff8507cb18242df5f40 /tests/units/test_branch.rb | |
| parent | abcb1453e210beb6de70a69d3501cf842b38636e (diff) | |
| download | third_party-ruby-git-b81ee9305f418209ba0d77fbb7b47b23d4b121ca.tar.gz third_party-ruby-git-b81ee9305f418209ba0d77fbb7b47b23d4b121ca.tar.xz third_party-ruby-git-b81ee9305f418209ba0d77fbb7b47b23d4b121ca.zip | |
added merging functions
Diffstat (limited to 'tests/units/test_branch.rb')
| -rw-r--r-- | tests/units/test_branch.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/units/test_branch.rb b/tests/units/test_branch.rb index 1560c55..bc7d807 100644 --- a/tests/units/test_branch.rb +++ b/tests/units/test_branch.rb @@ -68,7 +68,9 @@ class TestBranch < Test::Unit::TestCase assert(g.status.untracked.assoc('test-file1')) assert(!g.status.added.assoc('test-file1')) - g.branch('new_branch').delete + assert_raise Git::GitExecuteError do + g.branch('new_branch').delete + end assert_equal(1, g.branches.select { |b| b.name == 'new_branch' }.size) g.branch('master').checkout |