Commit 2b592f29 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'minor_refactoring' into 'master'

Minor refactoring

Add Repository#blob_at_branch method
......@@ -178,4 +178,14 @@ def tree(sha = :head, path = nil)
Tree.new(self, sha, path)
end
def blob_at_branch(branch_name, path)
last_commit = commit(branch_name)
if last_commit
blob_at(last_commit.sha, path)
else
nil
end
end
end
......@@ -24,8 +24,7 @@ def execute
return error("Your changes could not be committed, because file name contains not allowed characters")
end
commit = repository.commit(ref)
blob = repository.blob_at(commit.sha, file_path)
blob = repository.blob_at_branch(ref, file_path)
if blob
return error("Your changes could not be committed, because file with such name exists")
......
......@@ -17,8 +17,7 @@ def execute
return error("You can only create files if you are on top of a branch")
end
commit = repository.commit(ref)
blob = repository.blob_at(commit.sha, path)
blob = repository.blob_at_branch(ref, path)
unless blob
return error("You can only edit text files")
......
......@@ -17,8 +17,7 @@ def execute
return error("You can only create files if you are on top of a branch")
end
commit = repository.commit(ref)
blob = repository.blob_at(commit.sha, path)
blob = repository.blob_at_branch(ref, path)
unless blob
return error("You can only edit text files")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment