From b5bfe5af7b6eaaf841599be40ad64ff8b2689b55 Mon Sep 17 00:00:00 2001
From: root <eeeeka@itphx.ru>
Date: Thu, 8 Oct 2020 17:29:51 +0500
Subject: [PATCH] Add auto checkout to branch after pull

---
 webhook-catcher | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/webhook-catcher b/webhook-catcher
index d551c79..27adf91 100755
--- a/webhook-catcher
+++ b/webhook-catcher
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
 #
-# Webhook-catcher v1.1
+# Webhook-catcher v1.3
 #
 
 import os
@@ -32,7 +32,7 @@ from signal import signal, SIGHUP, SIGTERM
 from pprint import pprint
 
 PROG_NAME = "Webhook-catcher"
-PROG_VERSION = "v1.1"
+PROG_VERSION = "v1.3"
 PROG_DESCRIPTION = '\
   Simple HTTP-server for processing webhooks from Github or Gogs portals.\n\
   \n\
@@ -374,8 +374,17 @@ class WebHookWorker(object):
     if os.path.isdir(repo['dir']):
       result = subprocess.run([
           "git", "--git-dir", os.path.join(repo['dir'], '.git'), "--work-tree", repo['dir'], "pull",
-          repo['remote'], repo['branch'],
+          repo['remote'], repo['branch']
         ], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
+      if result.returncode == 0:
+        sub_result = subprocess.run([
+            "git", "--git-dir", os.path.join(repo['dir'], '.git'), "--work-tree", repo['dir'], "checkout",
+            repo['branch']
+          ], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
+
+        result.stdout += sub_result.stdout
+        result.stderr += sub_result.stderr
+        result.returncode = sub_result.returncode
     else:
       result = subprocess.run([
           "git", "clone", "--origin", repo['remote'], "--branch", repo['branch'], repo['url'], repo['dir']