From: Andrew Bartlett Date: Wed, 5 Sep 2018 01:57:35 +0000 (+1200) Subject: lorikeet-heimdal: apply_heimdal: Only show the Heimdal part of the patch to cherry... X-Git-Url: http://git.samba.org/?p=metze%2Fheimdal%2Fwip.git;a=commitdiff_plain;h=f2e94a4ca7406bbc5303a71289c0d691eab2ec15 lorikeet-heimdal: apply_heimdal: Only show the Heimdal part of the patch to cherry-pick Signed-off-by: Andrew Bartlett --- diff --git a/apply_heimdal.sh b/apply_heimdal.sh index 47cbf141b..8e86e8d82 100755 --- a/apply_heimdal.sh +++ b/apply_heimdal.sh @@ -16,7 +16,7 @@ popd try_patch() { commit="$1" - git format-patch --stdout $commit -1 > "$commit".patch + git format-patch --stdout $commit -1 source4/heimdal > "$commit".patch sed -i 's|/source4/heimdal/|/|g' "$commit".patch sed -i "s|^---$|(cherry picked from Samba commit $commit)\n---|g" "$commit".patch pushd $LORIKEET_PATH || exit 1