diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-08-29 07:46:30 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-09-01 00:08:23 -0700 |
| commit | d326d3428da89b943bb5f1d4d396f21b3e999ff7 (patch) | |
| tree | 218de7018f84bd040671f6fd87b4b760d363f63f /Gemfile.lock | |
| parent | 1c4e866348e0c782d2e5374209508785ac812c7a (diff) | |
| download | gitlab-ce-d326d3428da89b943bb5f1d4d396f21b3e999ff7.tar.gz | |
Optimize branch lookups and force a repository reload for Repository#find_branchsh-reload-find-branch
If `git gc` runs and `Repository` has an instance to `Rugged::Repository`, a
bug in libgit2 may cause the instance to return a stale value or a missing
branch. This change not only optimizes the branch lookup so we don't have
to iterate through every branch, but it also works around the `git gc`
issue by forcing a repository reload every time `Repository#find_branch`
is called.
See: https://github.com/libgit2/libgit2/issues/1534
Closes #15392, #21470
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1d0fcfd3c3a..28ede86b3ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,7 +279,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.4.7) + gitlab_git (10.5.0) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -858,7 +858,7 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_git (~> 10.4.7) + gitlab_git (~> 10.5) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) |