From 3b93856e131c3539650444356a259dd93f65cd26 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 17 Aug 2015 10:24:25 +0200
Subject: [PATCH] save repo empty state into variable for proper result

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/repository.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index f2f75e0e0f6..a1f2ea1d7e9 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -494,12 +494,13 @@ class Repository
     oldrev = Gitlab::Git::BLANK_SHA
     ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
     gl_id = Gitlab::ShellEnv.gl_id(current_user)
+    was_empty = empty?
 
     # Create temporary ref
     random_string = SecureRandom.hex
     tmp_ref = "refs/tmp/#{random_string}/head"
 
-    unless empty?
+    unless was_empty
       oldrev = find_branch(branch).target
       rugged.references.create(tmp_ref, oldrev)
     end
@@ -516,7 +517,7 @@ class Repository
     status = pre_receive_hook.trigger(gl_id, oldrev, newrev, ref)
 
     if status
-      if empty?
+      if was_empty
         # Create branch
         rugged.references.create(ref, newrev)
       else