diff options
author | Scott Chacon <schacon@gmail.com> | 2008-03-03 13:00:13 -0800 |
---|---|---|
committer | Scott Chacon <schacon@gmail.com> | 2008-03-03 13:00:13 -0800 |
commit | bc09a701262425adee32030c3b25f8b1c0be776e (patch) | |
tree | cb3b125fe607ff7fdfcc36546966195866937f0a /lib/git/branch.rb | |
parent | f859e805794378d8b6299c4c4a68be5c25f52e8a (diff) | |
parent | 55a5e323d241cfbd5a59d9a440c506b24b4c255a (diff) | |
download | third_party-ruby-git-bc09a701262425adee32030c3b25f8b1c0be776e.tar.gz third_party-ruby-git-bc09a701262425adee32030c3b25f8b1c0be776e.tar.xz third_party-ruby-git-bc09a701262425adee32030c3b25f8b1c0be776e.zip |
Merge commit 'eric/master' into test
Diffstat (limited to 'lib/git/branch.rb')
-rw-r--r-- | lib/git/branch.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/git/branch.rb b/lib/git/branch.rb index 6c1bc44..5dc8ec7 100644 --- a/lib/git/branch.rb +++ b/lib/git/branch.rb @@ -5,12 +5,15 @@ module Git @base = nil @gcommit = nil + @stashes = nil def initialize(base, name) @remote = nil @full = name @base = base + @stashes = Git::Stashes.new(@base) + parts = name.split('/') if parts[1] @remote = Git::Remote.new(@base, parts[0]) @@ -25,6 +28,10 @@ module Git @gcommit end + def stashes + @stashes ||= Git::Stashes.new(@base) + end + def checkout check_if_create @base.checkout(@full) |