aboutsummaryrefslogtreecommitdiffstats
path: root/merge-latest.sh
blob: 239da02c13c893017b8087b7ec7a750b14f0aa3b (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
#!/bin/bash
WG="/home/zx2c4/Projects/WireGuard"
SELF="$(readlink -f "${BASH_SOURCE[0]}")"
IT="${SELF%/*}"
set -x

git -C "$WG" diff where-we-left-off..master "$WG/src"/*.c "$WG/src"/*.h "$WG/src/selftest/" | patch -d "$IT/drivers/net/wireguard" -p2
git -C "$WG" diff where-we-left-off..master "$WG/src/uapi" | patch -d "$IT/include/uapi/linux" -p3
git -C "$WG" diff where-we-left-off..master "$WG/src/crypto/zinc" | patch -d "$IT/lib/zinc" -p4
git -C "$WG" diff where-we-left-off..master "$WG/src/crypto/include/zinc" | patch -d "$IT/include/zinc" -p5
cp "$WG/src/tests/netns.sh" "$IT/tools/testing/selftests/wireguard/netns.sh"

git -C "$WG" tag -f where-we-left-off