if we fail to find the ancestor, just try to compare to master

This commit is contained in:
Oren Mazor 2017-11-30 09:11:23 -05:00
parent 41d998f1c4
commit 2f233b362b

View file

@ -9,11 +9,12 @@ do
# Check that the ancestor has at least one parent
git rev-list --max-parents=0 "$local_sha" | grep "$first_ancestor" > /dev/null
if [ $? -ne 0 ]; then
args="--all-files"
source=$(git rev-parse master)
else
source=$(git rev-parse "$first_ancestor"^)
args="--origin $local_sha --source $source"
fi
args="--origin $local_sha --source $source"
fi
else
args="--origin $local_sha --source $remote_sha"