Skip to content

Check if branch contains commit #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 12, 2018
Merged

Check if branch contains commit #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de848e4
Check if branch contains commit
Aug 29, 2014
b9e424e
Merge branch 'master' into check_if_branch_contains_commit
kwstannard Jun 4, 2018
29ada4c
Merge branch 'master' into check_if_branch_contains_commit
kwstannard Jun 26, 2018
fddf313
Merge branch 'master' into check_if_branch_contains_commit
kwstannard Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ And here are the operations that will need to write to your git repository.
g.branch('new_branch').checkout
g.branch('new_branch').delete
g.branch('existing_branch').checkout
g.branch('master').contains?('existing_branch')

g.checkout('new_branch')
g.checkout(g.branch('new_branch'))
Expand Down
4 changes: 4 additions & 0 deletions lib/git/branch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ def current
determine_current
end

def contains?(commit)
!@base.lib.branch_contains(commit, self.name).empty?
end

def merge(branch = nil, message = nil)
if branch
in_branch do
Expand Down
3 changes: 3 additions & 0 deletions lib/git/lib.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,9 @@ def branch_current
branches_all.select { |b| b[1] }.first[0] rescue nil
end

def branch_contains(commit, branch_name="")
command("branch", [branch_name, "--contains", commit])
end

# returns hash
# [tree-ish] = [[line_no, match], [line_no, match2]]
Expand Down
8 changes: 8 additions & 0 deletions tests/units/test_branch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ def test_branches_single
end
end

def test_true_branch_contains?
assert(@git.branch('git_grep').contains?('master'))
end

def test_false_branch_contains?
assert(!@git.branch('master').contains?('git_grep'))
end

def test_branch_commit
assert_equal(270, @git.branches[:test_branches].gcommit.size)
end
Expand Down