|
|
@@ -19,10 +19,4 @@ git fetch --no-tags "${repo}" "${branch}:${fetch}"
|
|
|
git checkout "${fetch}"
|
|
|
git subtree split -P "${subdir}" -b "${split}"
|
|
|
git checkout "${prev}"
|
|
|
-
|
|
|
-exec 69>&1
|
|
|
-result="$(git subtree "${action}" -P "${path}" "${split}" -m "${action^} ${path} from ${repo}" 2>&1 | tee /proc/self/fd/69)"
|
|
|
-if grep "refusing to merge unrelated histories" <<< "$result" > /dev/null; then
|
|
|
- echo "History at ${repo} is unrelated, using squash..."
|
|
|
- git subtree "${action}" -P "${path}" "${split}" -m "${action^} ${path} from ${repo}" --squash
|
|
|
-fi
|
|
|
+git subtree "${action}" -P "${path}" "${split}" -m "${action^} ${path} from ${repo}"
|