sub/avm-git/lib/avm/git/scms/git.rb in eac_tools-0.38.0 vs sub/avm-git/lib/avm/git/scms/git.rb in eac_tools-0.39.0
- old
+ new
@@ -16,11 +16,11 @@
def <=>(other)
git_repo <=> other.git_repo
end
# @return [Avm::Git::Scms::Git::Commit,nil]
- def commitize(source)
+ def commit(source)
if source.is_a?(::Avm::Git::Scms::Git::Commit)
return source if source.git_repo == self
raise 'Not same Git repository'
end
@@ -34,11 +34,11 @@
return nil unless git_repo.dirty?
git_repo.command('add', '.').execute!
git_repo.command('commit', '-m',
message.call_if_proc.if_present(COMMIT_DIRTY_DEFAULT_MESSAGE)).execute!
- commitize(git_repo.head)
+ commit(git_repo.head)
end
# @return [Avm::Git::Scms::Git::Commit,nil]
def commit_if_change(message = nil)
tracker = ::Avm::Git::Scms::Git::ChangeTracker.new(self, message)
@@ -51,10 +51,10 @@
@git_repo ||= ::EacGit::Local.new(path)
end
# @return [Avm::Git::Scms::Git::Commit]
def reset_and_commit(commit_to_reset, message)
- git_repo.command('reset', '--soft', commitize(commit_to_reset).git_commit.id).execute!
+ git_repo.command('reset', '--soft', commit(commit_to_reset).git_commit.id).execute!
commit_dirty(message)
end
# @return [Enumerable<Avm::Git::Scms::GitSubrepo>]
def subs