This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from c5a9f52 git/hooks/update-irkerhook_only: delete garbage. new 4df078b git/hooks/update-script._irkerhook.py_: fix color parsing for rebase message. new 5cb7a62 git/hooks/update-script._irkerhook.py_: correctly get parent in a rebase. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/update-script._irkerhook.py_ | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 4df078b3752ca663529ae86cfb56e32ef0558ee8 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 4 01:06:46 2015 +0200 git/hooks/update-script._irkerhook.py_: fix color parsing for rebase message. --- git/hooks/update-script._irkerhook.py_ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git/hooks/update-script._irkerhook.py_ b/git/hooks/update-script._irkerhook.py_ index 254088e..d84cc4e 100755 --- a/git/hooks/update-script._irkerhook.py_ +++ b/git/hooks/update-script._irkerhook.py_ @@ -298,7 +298,7 @@ class GitExtractor(GenericExtractor): commit.logmsg = "\n".join(tmp) if self.rebase != '': - commit.logmsg = "%(cyan)sRebase detected.%(reset)s\nOld ref: " + self.rebase + "\nNew HEAD: " + commit.commit + "\nPlease check the URL for more information."; + commit.logmsg = "%(cyan)sRebase detected.%(reset)s\nOld ref: " + self.rebase + "\nNew HEAD: " + commit.commit + "\nPlease check the URL for more information." % self.__dict__; # This discards the part of the author's address after @. # Might be be nice to ship the full email address, if not # for spammers' address harvesters - getting this wrong -- Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 5cb7a6275a2d69efc04a60a848a8342db6de8b05 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 4 01:07:11 2015 +0200 git/hooks/update-script._irkerhook.py_: correctly get parent in a rebase. Makes the URL actually usable. --- git/hooks/update-script._irkerhook.py_ | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git/hooks/update-script._irkerhook.py_ b/git/hooks/update-script._irkerhook.py_ index d84cc4e..a06146a 100755 --- a/git/hooks/update-script._irkerhook.py_ +++ b/git/hooks/update-script._irkerhook.py_ @@ -307,7 +307,8 @@ class GitExtractor(GenericExtractor): commit.author_date, commit.commit_date = \ do("git log -1 '--pretty=format:%ai|%ci' " + shellquote(commit.commit)).split("|") if self.rebase != '': - commit.commit = self.rebase + ".." + commit.commit + parent = do("git merge-base " + shellquote(self.rebase) + " " + shellquote(commit.commit)) + commit.commit = parent + ".." + commit.commit return commit class SvnExtractor(GenericExtractor): -- Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git
-
git-admin＠x2go.org