git.samba.org
/
metze
/
heimdal
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b18df39
)
lorikeet-heimdal: Include Samba commit in cherry-picked patches
author
Andrew Bartlett
<abartlet@samba.org>
Wed, 5 Sep 2018 01:45:04 +0000
(13:45 +1200)
committer
Stefan Metzmacher
<metze@samba.org>
Wed, 29 Apr 2020 09:07:57 +0000
(11:07 +0200)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
apply_heimdal.sh
patch
|
blob
|
history
diff --git
a/apply_heimdal.sh
b/apply_heimdal.sh
index e953e5d4a843b6de4024ede147c404d3e2dfbec6..47cbf141bace711acc9d94c0cee6a26ef2c65dfc 100755
(executable)
--- 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