From ccbeb9bdddef1cb3bf051abc10fd715f1f401e02 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 5 Sep 2018 13:45:04 +1200 Subject: [PATCH] lorikeet-heimdal: Include Samba commit in cherry-picked patches Signed-off-by: Andrew Bartlett --- apply_heimdal.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/apply_heimdal.sh b/apply_heimdal.sh index e953e5d4a..47cbf141b 100755 --- a/apply_heimdal.sh +++ b/apply_heimdal.sh @@ -18,6 +18,7 @@ try_patch() { commit="$1" git format-patch --stdout $commit -1 > "$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 git reset --hard echo -- 2.34.1