Move error-handling to lib/gitlab/git
This commit is contained in:
parent
58aa32bcea
commit
728d7e0cf7
|
@ -259,17 +259,7 @@ class Repository
|
|||
return if kept_around?(sha)
|
||||
|
||||
# This will still fail if the file is corrupted (e.g. 0 bytes)
|
||||
begin
|
||||
raw_repository.write_ref(keep_around_ref_name(sha), sha, shell: false)
|
||||
rescue Gitlab::Git::CommandError => ex
|
||||
if ex.message.start_with?("ReferenceError: ")
|
||||
Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}"
|
||||
elsif ex.message.start_with?("OSError: ")
|
||||
raise unless ex.message =~ /Failed to create locked file/ && ex.message =~ /File exists/
|
||||
|
||||
Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}"
|
||||
end
|
||||
end
|
||||
raw_repository.write_ref(keep_around_ref_name(sha), sha, shell: false)
|
||||
end
|
||||
|
||||
def kept_around?(sha)
|
||||
|
|
|
@ -1395,9 +1395,11 @@ module Gitlab
|
|||
def rugged_write_ref(ref_path, ref)
|
||||
rugged.references.create(ref_path, ref, force: true)
|
||||
rescue Rugged::ReferenceError => ex
|
||||
raise CommandError, "ReferenceError: #{ex}"
|
||||
Rails.logger.error "Unable to create #{ref_path} reference for repository #{path}: #{ex}"
|
||||
rescue Rugged::OSError => ex
|
||||
raise CommandError, "OSError: #{ex}"
|
||||
raise unless ex.message =~ /Failed to create locked file/ && ex.message =~ /File exists/
|
||||
|
||||
Rails.logger.error "Unable to create #{ref_path} reference for repository #{path}: #{ex}"
|
||||
end
|
||||
|
||||
def fresh_worktree?(path)
|
||||
|
|
Loading…
Reference in New Issue