From: Ralf Jung <post@ralfj.de>
Date: Mon, 8 Jun 2015 18:23:10 +0000 (+0200)
Subject: fix some bugs
X-Git-Url: https://git.ralfj.de/git-mirror.git/commitdiff_plain/eea79d998ebaa55f0553696fbd51528f8f1f07ba?ds=inline;hp=-c

fix some bugs
---

eea79d998ebaa55f0553696fbd51528f8f1f07ba
diff --git a/git_mirror.py b/git_mirror.py
index b4b4964..859b376 100644
--- a/git_mirror.py
+++ b/git_mirror.py
@@ -154,7 +154,8 @@ class Repo:
             if len(local_state):
                 raise Exception("Something went wrong getting the local state of {}.".format(ref))
             local_sha = git_nullsha
-        assert local_sha in (oldsha, newsha), "Someone lied about the old SHA."
+        # some sanity checking, but deal gracefully with new branches appearing
+        assert local_sha in (git_nullsha, oldsha, newsha), "Someone lied about the old SHA: Local ({}) is neither old ({}) nor new ({})".format(local_sha, oldsha, newsha)
         # if we are already at newsha locally, we also ran the local hooks, so we do not have to do anything
         if local_sha == newsha:
             return "Local repository is already up-to-date."
diff --git a/github-add-hooks.py b/github-add-hooks.py
index 8e65d86..16baa0b 100755
--- a/github-add-hooks.py
+++ b/github-add-hooks.py
@@ -68,7 +68,7 @@ webhook_url = conf['DEFAULT']['webhook-url']
 shutil.copy(config_file, config_file+".bak")
 with open(config_file, 'a') as f:
     f.write('\n[{}]\n'.format(args.name))
-    f.write('owner={}\n'.format(args.owner))
+    f.write('owner={}\n'.format(args.email))
     f.write('local={}\n'.format(args.local))
     f.write('deploy-key={}\n'.format(os.path.basename(ssh_deploy_key)))
     f.write('hmac-secret={}\n'.format(hmac_secret))