From e6691d2c493028b5bd49aee78fdae65ca1dd3902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@ebcont.com>
Date: Fri, 2 Aug 2019 01:47:53 +0200
Subject: [PATCH] git_dir removed

---
 gitosis/.init.py.swp  | Bin 4096 -> 0 bytes
 gitosis/principals.py |   8 ++------
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 gitosis/.init.py.swp

diff --git a/gitosis/.init.py.swp b/gitosis/.init.py.swp
deleted file mode 100644
index 973607a75c66bb88a73c017a7c4ea672c808273d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmYc?2=nw+u+TGP00IF9hV}a$V~;(RXV9`^V8}|$&QB^W)+<iVC`~P@0;#|XN)pp`
zjg7%3V3mgn)}a}wpPpF)!uiFS#c(<^FSA6ipc1BMlpYO%(GZ|Q2$Ytj>00nI7#kTH
vfJ{?XQdAHY3Z;U<qehH|z-S1JhQMeDjE2By2#kinXb6mkz-R~zl@I^`O%5ZP

diff --git a/gitosis/principals.py b/gitosis/principals.py
index 32a9242..e095726 100644
--- a/gitosis/principals.py
+++ b/gitosis/principals.py
@@ -17,10 +17,7 @@ from gitosis import app
 from gitosis import util
 
 
-def serve_principal(cfg, git_dir, sshUser, principals):
-    export = os.path.join(git_dir, 'gitosis-export')
-    # re-read config to get up-to-date settings
-    cfg.read(os.path.join(export, '..', 'gitosis.conf'))
+def serve_principal(cfg, sshUser, principals):
 
     TEMPLATE=('command="gitosis-serve %(user)s",no-port-forwarding,'
               +'no-X11-forwarding,no-agent-forwarding,no-pty %(principals)s')
@@ -51,14 +48,13 @@ class Main(app.App):
 
         log = logging.getLogger('gitosis.principals')
 
-        git_dir = os.environ.get('GIT_DIR')
         if git_dir is None:
             log.error('Must have GIT_DIR set in enviroment')
             sys.exit(1)
 
         if sshUser != "":
             log.info('Running serve_principal for user %s', sshUser)
-            serve_principal(cfg, git_dir, sshUser, principals)
+            serve_principal(cfg, sshUser, principals)
             log.info('Done.')
 #
 #        if hook == 'post-update':