[X2Go-Commits] [maintenancescripts] 03/04: git/hooks/update-script._irkerhook.py_: to generate a diff spanning multiple commits in gitweb, we need to use the hp parameter.

[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 22fb21468ecb642680655278511db2660b292c5e
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Jan 2 11:13:11 2020 +0100

    git/hooks/update-script._irkerhook.py_: to generate a diff spanning multiple commits in gitweb, we need to use the hp parameter.
    
    Keep hb around for merge bases (i.e., useful in case of rebases).
---
 git/hooks/update-script._irkerhook.py_ | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/git/hooks/update-script._irkerhook.py_ b/git/hooks/update-script._irkerhook.py_
index 6299a6e..babaaae 100755
--- a/git/hooks/update-script._irkerhook.py_
+++ b/git/hooks/update-script._irkerhook.py_
@@ -371,8 +371,10 @@ class GitExtractor(GenericExtractor):
         commit.author = commit.mail.split("@")[0]
         commit.author_date, commit.commit_date = \
             do("git log -1 '--pretty=format:%ai|%ci' " + shellquote(commit.commit)).split("|")
-        if self.rebase != '' or self.new:
+        if self.rebase != '':
             commit.commit = commit.commit + ";hb=" + parent
+        if self.new:
+            commit.commit = commit.commit + ";hp=" + parent
         return commit
 
 class SvnExtractor(GenericExtractor):

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git