Commit 020ca677 authored by Ben Boeckel's avatar Ben Boeckel

update-common: always use a subtree option for merging

parent 0cb43e98
......@@ -130,13 +130,10 @@ readonly newhash="$( git rev-parse HEAD )"
popd
# Merge the subset into this repository
if [ -n "$basehash" ]; then
git merge -s recursive "-Xsubtree=$subtree/" --no-commit "$newhash"
else
if [ -z "$basehash" ]; then
git fetch "$extractdir"
git merge -s ours --no-commit "$newhash"
git read-tree -u --prefix="$subtree/" "$newhash"
fi
git merge -s recursive "-Xsubtree=$subtree/" --no-commit "$newhash"
sed -i -e "/NEWHASH$/s/='.*'/='$newhash'/" "$update"
git add "$update"
git commit -m "$name: update to $tag"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment