diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-30 18:48:56 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-30 18:48:56 +0000 |
| commit | 40e128730f4799dcf0fc485f3b6541db0b9c5767 (patch) | |
| tree | c739f69f3f860f18e610d681c2549c57caad79d4 /app | |
| parent | 4752f629cdcc25fd7755dd73ccf3a8e78a37b476 (diff) | |
| parent | 10fb904d636ab49b87e2deb756f64fc26d2eacec (diff) | |
| download | gitlab-ce-40e128730f4799dcf0fc485f3b6541db0b9c5767.tar.gz | |
Merge branch 'gitaly-784-repo-write-ref' into 'master'
Migrate Git::Repository#write_ref to Gitaly
Closes gitaly#784
See merge request gitlab-org/gitlab-ce!16513
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 872d4468ac8..6c776301ac2 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -255,6 +255,8 @@ class Repository # This will still fail if the file is corrupted (e.g. 0 bytes) raw_repository.write_ref(keep_around_ref_name(sha), sha, shell: false) + rescue Gitlab::Git::CommandError => ex + Rails.logger.error "Unable to create keep-around reference for repository #{path}: #{ex}" end def kept_around?(sha) |