blob: a720766d3c8624d3a7d429d8809f67f9676ab2e0 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
#!/bin/bash
[ $# == 2 ] || {
echo "Usage: apply_heimdal.sh <lorikeet_path>"
exit 1
}
LORIKEET_PATH="$1"
IMPORT_HASH="$2"
S4PATH="$PWD"
pushd $LORIKEET_PATH || exit 1
git reset --hard
git am --abort
popd
# From https://gist.github.com/kfish/7425248
apply () {
filename=$1
shift
patch_args=$*
gotSubject=no
msg=""
cat $filename | while read line; do
if [ "$line" == "---" ]; then
patch $patch_args -p1 < $filename
git commit -a -m 'CHECK AUTHOR' -m "$msg"
break
fi
if [ "$gotSubject" == "no" ]; then
hdr=(${line//:/ })
if [ "${hdr[0]}" == "Subject" ]; then
gotSubject=yes
msg="${hdr[@]:3}"
fi
else
msg="$msg $line"
fi
msg="$msg
"
done
}
try_patch() {
commit="$1"
git format-patch --stdout $commit -1 third_party/heimdal > "$commit".patch
sed -i 's|/third_party/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
if patch -p1 --forward < "$S4PATH/$commit.patch"; then
echo
echo "Commit $commit can apply - applying"
git reset --hard
git am "$S4PATH/$commit.patch" || apply "$S4PATH/$commit.patch"
else
echo
echo "Commit $commit does not apply cleanly"
echo
fi
git am --abort
popd || exit 1
}
commits="$(git log --pretty=oneline --reverse $IMPORT_HASH..HEAD -- third_party/heimdal | cut -d' ' -f1)"
for c in $commits; do
git log $c -1
echo -n "Try apply? [Y/n] "
read answer
case $answer in
n*)
continue
;;
*)
try_patch $c
;;
esac
done
|
