Commit 8f40ebf4 authored by Hugh Davenport's avatar Hugh Davenport

Makefile: check mergebase of remote not local branch

Change-Id: I62c48bfc55e7bc80dca97a34592d6e8fbd00a465
Signed-off-by: default avatarHugh Davenport <hugh@catalyst.net.nz>
parent e475cdb9
......@@ -20,7 +20,7 @@ jenkinsaccept: minaccept
@find ./ ! -path './.git/*' -type f | xargs clamscan > /dev/null && echo All good!
sshargs := $(shell git config --get remote.gerrit.url | sed -re 's~^ssh://([^@]*)@([^:]*):([0-9]*)/mahara~-p \3 -l \1 \2~')
mergebase := $(shell git merge-base HEAD master)
mergebase := $(shell git merge-base HEAD gerrit/master)
sha1chain := $(shell git log $(mergebase)..HEAD --pretty=format:%H | xargs)
changeidchain := $(shell git log $(mergebase)..HEAD --pretty=format:%b | grep '^Change-Id:' | cut -d' ' -f2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment