[X2Go-Commits] [maintenancescripts] 02/02: git/hooks/update-script._irkerhook.py_: correctly get parent in a rebase.

[git-admin at x2go.org]

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 at 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