From 58aa32bceab1483897f3e898151e60b0cf917f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?=
 <kim.carlbacker@gmail.com>
Date: Thu, 18 Jan 2018 21:31:40 +0100
Subject: Wrap Rugged-exceptions in Gitlab::Git::Repository#write_ref

---
 app/models/repository.rb     | 12 +++++++-----
 lib/gitlab/git/repository.rb | 30 +++++++++++++++++-------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index b4bc0f87458..f717d248615 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -261,12 +261,14 @@ class Repository
     # 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 Rugged::ReferenceError => ex
-      Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}"
-    rescue Rugged::OSError => ex
-      raise unless ex.message =~ /Failed to create locked file/ && ex.message =~ /File exists/
+    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}"
+        Rails.logger.error "Unable to create #{REF_KEEP_AROUND} reference for repository #{path}: #{ex}"
+      end
     end
   end
 
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index d0467bca992..e36ab2e32f6 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1126,19 +1126,6 @@ module Gitlab
         end
       end
 
-      def shell_write_ref(ref_path, ref, old_ref)
-        raise ArgumentError, "invalid ref_path #{ref_path.inspect}" if ref_path.include?(' ')
-        raise ArgumentError, "invalid ref #{ref.inspect}" if ref.include?("\x00")
-        raise ArgumentError, "invalid old_ref #{old_ref.inspect}" if !old_ref.nil? && old_ref.include?("\x00")
-
-        input = "update #{ref_path}\x00#{ref}\x00#{old_ref}\x00"
-        run_git!(%w[update-ref --stdin -z]) { |stdin| stdin.write(input) }
-      end
-
-      def rugged_write_ref(ref_path, ref)
-        rugged.references.create(ref_path, ref, force: true)
-      end
-
       def fetch_ref(source_repository, source_ref:, target_ref:)
         Gitlab::Git.check_namespace!(source_repository)
         source_repository = RemoteRepository.new(source_repository) unless source_repository.is_a?(RemoteRepository)
@@ -1396,6 +1383,23 @@ module Gitlab
 
       private
 
+      def shell_write_ref(ref_path, ref, old_ref)
+        raise ArgumentError, "invalid ref_path #{ref_path.inspect}" if ref_path.include?(' ')
+        raise ArgumentError, "invalid ref #{ref.inspect}" if ref.include?("\x00")
+        raise ArgumentError, "invalid old_ref #{old_ref.inspect}" if !old_ref.nil? && old_ref.include?("\x00")
+
+        input = "update #{ref_path}\x00#{ref}\x00#{old_ref}\x00"
+        run_git!(%w[update-ref --stdin -z]) { |stdin| stdin.write(input) }
+      end
+
+      def rugged_write_ref(ref_path, ref)
+        rugged.references.create(ref_path, ref, force: true)
+      rescue Rugged::ReferenceError => ex
+        raise CommandError, "ReferenceError: #{ex}"
+      rescue Rugged::OSError => ex
+        raise CommandError, "OSError: #{ex}"
+      end
+
       def fresh_worktree?(path)
         File.exist?(path) && !clean_stuck_worktree(path)
       end
-- 
cgit v1.2.1


From 728d7e0cf7b1570bc53f143a69612365e493d7a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?=
 <kim.carlbacker@gmail.com>
Date: Mon, 22 Jan 2018 15:40:38 +0100
Subject: Move error-handling to lib/gitlab/git

---
 app/models/repository.rb     | 12 +-----------
 lib/gitlab/git/repository.rb |  6 ++++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index f717d248615..73c4899cb9b 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -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)
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index e36ab2e32f6..27037af55c6 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -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)
-- 
cgit v1.2.1