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:
ccbeb9b
)
lorikeet-heimdal: apply_heimdal: Only show the Heimdal part of the patch to cherry...
author
Andrew Bartlett
<abartlet@samba.org>
Wed, 5 Sep 2018 01:57:35 +0000
(13:57 +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 47cbf141bace711acc9d94c0cee6a26ef2c65dfc..8e86e8d824317ca0239d151b2a0cae391f00571c 100755
(executable)
--- 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