Willy-JL 2 лет назад
Родитель
Сommit
a2d3380d66
1 измененных файлов с 1 добавлено и 1 удалено
  1. 1 1
      .utils/subtree-subdir-helper.sh

+ 1 - 1
.utils/subtree-subdir-helper.sh

@@ -21,7 +21,7 @@ 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 >(cat - >&69))"
+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 quash..."
     git subtree "${action}" -P "${path}" "${split}" -m "${action^} ${path} from ${repo}" --squash