This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 35cfe307bf361f6059c3685058d397fead9ee7e2 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 4 00:45:09 2015 +0200 git/hooks/update-script._irkerhook.py_: add experimental rebase support. --- git/hooks/update-script._irkerhook.py_ | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/git/hooks/update-script._irkerhook.py_ b/git/hooks/update-script._irkerhook.py_ index 774ee18..18ba5d1 100755 --- a/git/hooks/update-script._irkerhook.py_ +++ b/git/hooks/update-script._irkerhook.py_ @@ -240,6 +240,7 @@ class GitExtractor(GenericExtractor): # These are git-specific self.refname = do("git symbolic-ref HEAD 2>/dev/null") self.revformat = do("git config --get irker.revformat") + self.rebase = '' # The project variable defaults to the name of the repository toplevel. if not self.project: bare = do("git config --bool --get core.bare") @@ -277,7 +278,10 @@ class GitExtractor(GenericExtractor): if not commit.rev: commit.rev = commit.commit[:12] # Extract the meta-information for the commit - commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit)) + if self.rebase == '' + commit.files = do("git diff-tree -r --name-only " + shellquote(commit.commit)) + else + commit.files = do("git diff-tree -r --name-only " + shellquote(self.rebase) + ".." + shellquote(commit.commit)) commit.files = " ".join(commit.files.strip().split("\n")[1:]) # Design choice: for git we ship only the first message line, which is # conventionally supposed to be a summary of the commit. Under @@ -292,6 +296,9 @@ class GitExtractor(GenericExtractor): tmp.append ("%(lightgrey)s... message truncated%(reset)s" % self.__dict__) 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."; # 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 @@ -299,6 +306,8 @@ 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 != '' + commit.commit = self.rebase + ".." + 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

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 289c63ccd0c49997c80c55b2c462fe4255338ea7 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 4 00:48:07 2015 +0200 git/hooks/update-irkerhook_only: make merge- and rebase-aware. Don't flood the channel. --- git/hooks/update-irkerhook_only | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/git/hooks/update-irkerhook_only b/git/hooks/update-irkerhook_only index 57c3a95..e948471 100755 --- a/git/hooks/update-irkerhook_only +++ b/git/hooks/update-irkerhook_only @@ -9,6 +9,30 @@ REFNAME="${1}" OLD="${2}" NEW="${3}" -git rev-list --reverse "${OLD}..${NEW}" | while read cur_rev; do - "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._irkerhook.py_" --refname="${REFNAME}" "${cur_rev}" --repo="${SHORT_GIT_REPO_NAME}" || : -done +typeset -i merge="0" +typeset -i ff="0" + +if [ -z "$(git rev-list --merges "${OLD}..${NEW}")" ]; then + merge="0" +else + merge="1" +fi + +typeset merge_base="$(git merge-base "${OLD}" "${NEW}")" +if [ "${merge_base}" = "${OLD}" ]; then + ff="1" +else + ff="0" +fi + +if [ "${ff}" -eq "1" ] && [ "${merge}" -eq "0" ]; then + git rev-list --reverse "${OLD}..${NEW}" | while read cur_rev; do + "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._irkerhook.py_" --refname="${REFNAME}" "${cur_rev}" --repo="${SHORT_GIT_REPO_NAME}" || : + done +elif [ "${merge}" -eq "1" ]; then + git rev-list --reverses "${NEW}^..${NEW}" | while read cur_rev; do + "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._irkerhook.py_" --refname="${REFNAME}" "${cur_rev}" --repo="${SHORT_GIT_REPO_NAME}" || : + done +elif [ "${ff}" -eq "0" ]; then + "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._irkerhook.py_" --refname="${REFNAME}" --rebase="${OLD}" "${NEW}" --repo="${SHORT_GIT_REPO_NAME}" || : +fi -- Alioth's /srv/git/code.x2go.org/maintenancescripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git