Skip to content

Commit

Permalink
Fixing password issue
Browse files Browse the repository at this point in the history
  • Loading branch information
tusharmakkar08 committed Nov 4, 2016
1 parent 665db06 commit 03f3037
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions update_documentation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ URL=$(git remote -v | head -n1 | cut -f2 | cut -d" " -f1)
echo "Repo url is $URL"
PUSH_URL="https://$GIT_USER:$GIT_PASS@${URL:8}"

git remote set-url origin ${PUSH_URL}

echo "Checking out $FROM_BRANCH..." && \
git fetch origin ${FROM_BRANCH}:${FROM_BRANCH} && \
git checkout ${FROM_BRANCH}
Expand All @@ -44,7 +46,7 @@ git merge ${FROM_BRANCH} && \

# Push changes back to remote vcs
echo "Pushing changes..." && \
git push ${PUSH_URL} && \
git push && \
echo "Merge complete!" || \
echo "Error Occurred. Merge failed"

Expand All @@ -56,4 +58,4 @@ echo "Sphinx not able to generate HTML"

git status && git add . &&
git commit -m "Auto updating documentation from $CURRENT_BRANCH" &&
git push ${PUSH_URL} || echo "Changes not pushed" && exit 1
git push && echo "Documentation pushed"

0 comments on commit 03f3037

Please sign in to comment.