Commit 9ac205a7 authored by Ben Boeckel's avatar Ben Boeckel

update-common: force fetching into the upstream-$name branch

Local branches of this name are unlikely anyways and the only ones which
exist are those which are leftover from a failed import.
parent 10ea00e8
......@@ -173,7 +173,7 @@ else
fi
readonly unrelated_histories_flag
git fetch "$extractdir" "upstream-$name:upstream-$name"
git fetch "$extractdir" "+upstream-$name:upstream-$name"
git merge --log -s ours --no-commit $unrelated_histories_flag "upstream-$name"
git read-tree -u --prefix="$subtree/" "upstream-$name"
fi
......
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