[DRE-commits] [gitlab-shell] 01/01: Fix patch

[Balasankar C]

This is an automated email from the git hooks/post-receive script.

balasankarc-guest pushed a commit to branch master
in repository gitlab-shell.

commit a0f5dc1b4b3655c4b52ae7bf77f374476118e318
Author: Balasankar C <balasankarc at autistici.org>
Date:   Tue Feb 7 20:51:55 2017 +0530

    Fix patch
---
 debian/patches/git-env.patch | 57 +++++++++++++++++---------------------------
 1 file changed, 22 insertions(+), 35 deletions(-)

diff --git a/debian/patches/git-env.patch b/debian/patches/git-env.patch
index ed124fb..9cb5616 100644
--- a/debian/patches/git-env.patch
+++ b/debian/patches/git-env.patch
@@ -1,40 +1,26 @@
-From fc2016484aacb82980c1c9082e195110f0eacb34 Mon Sep 17 00:00:00 2001
-From: Timothy Andrew <mail at timothyandrew.net>
-Date: Wed, 7 Dec 2016 13:09:47 +0530
-Subject: [PATCH 1/2] Pass relevant git environment variables while calling
- `/allowed`
-
-1. Starting version 2.11, git changed the way the pre-receive flow works.
-
-  - Previously, the new potential objects would be added to the main repo. If the
-    pre-receive passes, the new objects stay in the repo but are linked up. If
-    the pre-receive fails, the new objects stay orphaned in the repo, and are
-    cleaned up during the next `git gc`.
-
-  - In 2.11, the new potential objects are added to a temporary "alternate object
-    directory", that git creates for this purpose. If the pre-receive passes, the
-    objects from the alternate object directory are migrated to the main repo. If
-    the pre-receive fails the alternate object directory is simply deleted.
-
-2. In our workflow, the pre-recieve script calls the `/allowed` endpoint on the
-   rails server. This `/allowed` endpoint calls out directly to git to perform
-   various checks. These direct calls to git do _not_ have the necessary
-   environment variables set which allow access to the "alternate object
-   directory" (explained above). Therefore these calls to git are not able to
-   access any of the new potential objects to be added during this push.
-
-3. We fix this by passing the relevant environment variables
-   (GIT_ALTERNATE_OBJECT_DIRECTORIES, GIT_OBJECT_DIRECTORY, and
-   GIT_QUARANTINE_PATH) to the `/allowed` endpoint, which will then include
-   these environment variables while calling out to git.
+Description: Ensure compatibility with git 2.11 by setting env variables
+Author: Rémy Coutable <remy at rymai.me>
+Applied-Upstream: https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/120/
+Last-Update: 2017-02-07
 ---
- lib/gitlab_access.rb | 7 ++++++-
- lib/gitlab_net.rb    | 5 +++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CHANGELOG
++++ b/CHANGELOG
+@@ -1,3 +1,6 @@
++v3.6.7
++  - Send (a selection of) git environment variables while making the API call to `/allowed`, !112
++
+ v3.6.6
+   - Re-use the default logger when logging metrics data
+ 
+--- a/VERSION
++++ b/VERSION
+@@ -1 +1 @@
+-3.6.6
++3.6.7
 --- a/lib/gitlab_access.rb
 +++ b/lib/gitlab_access.rb
-@@ -21,7 +21,11 @@
+@@ -21,7 +21,12 @@
    end
  
    def exec
@@ -43,7 +29,8 @@ Subject: [PATCH 1/2] Pass relevant git environment variables while calling
 +      "GIT_ALTERNATE_OBJECT_DIRECTORIES" => ENV["GIT_ALTERNATE_OBJECT_DIRECTORIES"],
 +      "GIT_OBJECT_DIRECTORY" => ENV["GIT_OBJECT_DIRECTORY"]
 +    }
-+   status = api.check_access('git-receive-pack', @repo_path, @actor, @changes, @protocol, env: env.to_json)
++
++    status = api.check_access('git-receive-pack', @repo_name, @actor, @changes, @protocol, env: env.to_json)
  
      raise AccessDeniedError, status.message unless status.allowed?
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab-shell.git