File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -24,22 +24,22 @@ build:
2424 if [ "$READTHEDOCS_VERSION_TYPE" = "external" ];
2525 then
2626 base_branch=3.14;
27- git fetch --depth=50 origin $base_branch:origin/ $base_branch;
27+ git fetch --depth=50 origin $base_branch:origin- $base_branch;
2828 for attempt in $(seq 10);
2929 do
30- if ! git merge-base HEAD origin/ $base_branch;
30+ if ! git merge-base HEAD origin- $base_branch;
3131 then
3232 git fetch --deepen=50 origin $base_branch;
3333 else
3434 break;
3535 fi;
3636 done;
37- if ! git -c "user.name=rtd" -c "user.email=no-reply@readthedocs.org" merge --no-stat --no-edit origin/ $base_branch;
37+ if ! git -c "user.name=rtd" -c "user.email=no-reply@readthedocs.org" merge --no-stat --no-edit origin- $base_branch;
3838 then
3939 echo "Unsuccessful merge with '$base_branch' branch, skipping the build";
4040 exit 183;
4141 fi;
42- if git diff --exit-code --stat origin/ $base_branch -- Doc/ .readthedocs.yml;
42+ if git diff --exit-code --stat origin- $base_branch -- Doc/ .readthedocs.yml;
4343 then
4444 echo "No changes to Doc/ - skipping the build.";
4545 exit 183;
You can’t perform that action at this time.
0 commit comments