diff options
| author | Erich Eckner <git@eckner.net> | 2019-01-11 16:29:31 +0100 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-01-11 16:29:31 +0100 |
| commit | 00dc9fe4cd71abd2fd6008ec8928274411dde58d (patch) | |
| tree | 015cdd3e9491ee8c470e201f1cdb87786b403e26 /openttd-git/update-patches | |
| parent | 81ea00968932eac35dd456f3d5c61352b2122b38 (diff) | |
| download | archlinuxewe-00dc9fe4cd71abd2fd6008ec8928274411dde58d.tar.xz | |
openttd-git: patches should be agains the merge-base!
Diffstat (limited to 'openttd-git/update-patches')
| -rwxr-xr-x | openttd-git/update-patches | 2 |
1 files changed, 1 insertions, 1 deletions
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}' |