From 00dc9fe4cd71abd2fd6008ec8928274411dde58d Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 11 Jan 2019 16:29:31 +0100
Subject: openttd-git: patches should be agains the merge-base!

---
 openttd-git/update-patches | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'openttd-git/update-patches')

diff --git a/openttd-git/update-patches b/openttd-git/update-patches
index 231af4d7c..05400935f 100755
--- a/openttd-git/update-patches
+++ b/openttd-git/update-patches
@@ -21,7 +21,7 @@ sums=$(
         d
       ' \
       | while read -r patch; do
-        git -C openttd-git diff master "remotes/local/${patch}" -- \
+        git -C openttd-git diff $(git -C openttd-git merge-base master "remotes/local/${patch}") "remotes/local/${patch}" -- \
           > "${patch}.patch"
         sha512sum "${patch}.patch" | \
           awk '{print $1}'
-- 
cgit v1.2.3-70-g09d2