summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2015-09-06 17:39:21 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2015-09-06 17:39:21 +0200
commit7de76a09d566ea1eb47741a4fb5bf632e2475201 (patch)
treeea7865ff1ab46020039033c4fb1438ac5c0cde8d
parent77e6b6a312fff61f9ad6eaaf1453b34c9e0fb575 (diff)
fix git command for contrib authors
-rw-r--r--AUTHORS.md50
-rwxr-xr-xbin/git/hooks/pre-commit3
-rw-r--r--bin/git/tools/create_contributors.py2
3 files changed, 29 insertions, 26 deletions
diff --git a/AUTHORS.md b/AUTHORS.md
index c1acbc641..a1d4b6da4 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -11,45 +11,45 @@
* [Hoàng Đức Hiếu](mailto:hdhoang@zahe.me)
* [Thomas Müller](mailto:thomas.mueller@tmit.eu)
* [Lukas Reschke](mailto:lukas@statuscode.ch)
-* [Thomas Tanghus](mailto:thomas@tanghus.net)
-* [Volkan Gezer](mailto:volkangezer@gmail.com)
* [Xéfir Destiny](mailto:xefir@crystalyx.net)
* [Christian Elmer](mailto:christian@keinkurt.de)
* [Bart Visscher](mailto:bartv@thisnet.nl)
-* [darkside40](mailto:darkside401@googlemail.com)
-* [bluehaze](mailto:francesco.sportolari@gmail.com)
+* [Thomas Tanghus](mailto:thomas@tanghus.net)
+* [Volkan Gezer](mailto:volkangezer@gmail.com)
* [Thomas Mueller](mailto:thomas.mueller@tmit.eu)
* [Lars Bensmann](mailto:lars@almosthappy.de)
-* [Brice Maron](mailto:brice@bmaron.net)
+* [darkside40](mailto:darkside401@googlemail.com)
+* [bluehaze](mailto:francesco.sportolari@gmail.com)
* [Jakob Sack](mailto:mail@jakobsack.de)
* [Qingping Hou](mailto:dave2008713@gmail.com)
-* [Michael Gapczynski](mailto:mtgap@owncloud.com)
-* [davidak](mailto:git@davidak.de)
+* [Brice Maron](mailto:brice@bmaron.net)
* [John Kristensen](mailto:john@jerrykan.com)
* [Maik Kulbe](mailto:info@linux-web-development.de)
-* [Andreas Fischer](mailto:bantu@owncloud.com)
+* [lsmooth](mailto:ls@lsmooth.de)
* [benediktb](mailto:benedikt@blablub.de)
-* [s17t.net](mailto:mail+github@s17t.net)
* [IBBoard](mailto:github@ibboard.co.uk)
-* [Peter Hedlund](mailto:peter@peterandlinda.com)
* [David-Development](mailto:david-dev@live.de)
-* [lsmooth](mailto:ls@lsmooth.de)
* [David](mailto:david-dev@live.de)
-* [kondou](mailto:kondou@ts.unde.re)
-* [Frank Karlitschek](mailto:frank@owncloud.org)
-* [TexasGamer](mailto:tpgaubert@gmail.com)
+* [Michael Gapczynski](mailto:mtgap@owncloud.com)
+* [Peter Hedlund](mailto:peter@peterandlinda.com)
+* [davidak](mailto:git@davidak.de)
+* [s17t.net](mailto:mail+github@s17t.net)
+* [Andreas Fischer](mailto:bantu@owncloud.com)
+* [kgraefe](mailto:konradgraefe@aol.com)
* [Xemle](mailto:xemle@phtagr.org)
-* [Alessandro](mailto:acosenti@malutchosky.(none))
-* [Patrick O'Keeffe](mailto:patricktokeeffe@users.noreply.github.com)
-* [repat](mailto:repat@repat.de)
-* [joeplus](mailto:joerg@honululu.Speedport_W_723V_1_32_000)
-* [Konrad Graefe](mailto:konradgraefe@aol.com)
-* [Nick Frey](mailto:nickfrey123@gmail.com)
-* [Piotr Dobrowolski](mailto:admin@tastycode.pl)
-* [Michael Grosser](mailto:github@stp-ip.net)
* [bjoerns1983](mailto:bjoern@sengotta.net)
-* [kgraefe](mailto:konradgraefe@aol.com)
-* [Matthias Blümel](mailto:user@inanna.local)
+* [Florian Hülsmann](mailto:fh@cbix.de)
+* [TexasGamer](mailto:tpgaubert@gmail.com)
+* [Nick Frey](mailto:nickfrey123@gmail.com)
+* [Frank Karlitschek](mailto:frank@owncloud.org)
* [markusj](mailto:markusj@users.noreply.github.com)
* [Andrea Boero](mailto:mail@tsumi.it)
-* [Florian Hülsmann](mailto:fh@cbix.de) \ No newline at end of file
+* [repat](mailto:repat@repat.de)
+* [Patrick O'Keeffe](mailto:patricktokeeffe@users.noreply.github.com)
+* [Matthias Blümel](mailto:user@inanna.local)
+* [joeplus](mailto:joerg@honululu.Speedport_W_723V_1_32_000)
+* [Michael Grosser](mailto:github@stp-ip.net)
+* [Piotr Dobrowolski](mailto:admin@tastycode.pl)
+* [Konrad Graefe](mailto:konradgraefe@aol.com)
+* [kondou](mailto:kondou@ts.unde.re)
+* [Alessandro](mailto:acosenti@malutchosky.(none)) \ No newline at end of file
diff --git a/bin/git/hooks/pre-commit b/bin/git/hooks/pre-commit
index 202992f9e..d4edff8cd 100755
--- a/bin/git/hooks/pre-commit
+++ b/bin/git/hooks/pre-commit
@@ -12,3 +12,6 @@ cd ..
phpunit -c phpunit.xml
phpunit -c phpunit.integration.xml
git add appinfo/checksum.json
+
+python3 bin/git/tools/create_contributors.py
+git add AUTHORS.md
diff --git a/bin/git/tools/create_contributors.py b/bin/git/tools/create_contributors.py
index 643d22f68..93a43ca50 100644
--- a/bin/git/tools/create_contributors.py
+++ b/bin/git/tools/create_contributors.py
@@ -4,7 +4,7 @@ import subprocess
import re
import os.path
-contribs = subprocess.check_output(['git', 'shortlog', '-e', '-s', '-n'])
+contribs = subprocess.check_output(['git', '--no-pager', 'shortlog', '-nse', 'HEAD'])
contrib_lines = contribs.decode('utf-8').split('\n')
format_regex = r'^\s*(?P<commit_count>\d+)\s*(?P<name>.*\w)\s*<(?P<email>[^\s]+)>$'