allow-unrelated-histories about scripts HOT 3 CLOSED

What version of git are you using (git --version)? This pull request made suppresses the "--allow-unrelated-histories" option, so that the script could support older git versions that don't have a --allow-unrelated-histories option. It's possible that there's a but in that commit.

#2

from scripts.

@jeremysears

git version 2.13.2, I suppose you compare versions in wrong order:

${OP_VERSION} -le ${GIT_VERSION}

mean if 2.8.4 <= cur_git_version; then ALLOW_UNRELATED_HISTORIES=""
but you need if cur_git_version <= 2.8.4; then ALLOW_UNRELATED_HISTORIES=""

or actually you can remove all version checking and do something like:

git merge  -s ours --no-commit "${sub}/master" || git merge --allow-unrelated-histories  -s ours --no-commit "${sub}/master"

from scripts.

Fixed in pull request #5

from scripts.