This commit is contained in:
Oren Mazor 2018-01-24 17:27:54 +00:00 committed by GitHub
commit 8eb341a89f

View file

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