Skip to content
Snippets Groups Projects
Commit 8519b7dd authored by Michael Vines's avatar Michael Vines
Browse files

Use |git am| when patching to preserve commit text and author

Change-Id: I27e1fc17c393647193b8214e2b448bb260bf2948
parent 2e484664
No related branches found
No related tags found
No related merge requests found
......@@ -101,9 +101,9 @@ __patch_tree()
fi
fi
}
apply() {
am() {
if [[ -d .git ]]; then
git apply --index $1
git am $1
else
patch -p1 < $1
fi
......@@ -200,7 +200,7 @@ __patch_tree()
echo " ${P}"
case $P in
*.patch) apply ${ROOT_DIR}/$P ; commit $P ;;
*.patch) am ${ROOT_DIR}/$P ;;
*.sh) source ${ROOT_DIR}/$P ; commit $P ;;
*.sha1) cherrypick ${ROOT_DIR}/$P ;;
esac
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment