Skip to content
Snippets Groups Projects
Commit cad2a562 authored by Xu Cheng's avatar Xu Cheng
Browse files

update: passing --force to git fetch

Per document:
> -f, --force
>    When git fetch is used with <rbranch>:<lbranch> refspec, it refuses
>    to update the local branch <lbranch> unless the remote branch
>    <rbranch> it fetches is a descendant of <lbranch>. This option
>    overrides that check.
parent 16f8b16f
No related branches found
No related tags found
No related merge requests found
......@@ -349,7 +349,7 @@ EOS
[[ "$UPSTREAM_SHA_HTTP_CODE" = "304" ]] && exit
fi
git fetch "${QUIET_ARGS[@]}" origin \
git fetch --force "${QUIET_ARGS[@]}" origin \
"refs/heads/$UPSTREAM_BRANCH:refs/remotes/origin/$UPSTREAM_BRANCH" || \
odie "Fetching $DIR failed!"
) &
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment