From c0f1052efb3647a443295f8fd7e4cf145d15297b Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 5 May 2017 14:14:13 -0500 Subject: [PATCH] Fix mfrb and mfpub --- buildroot/share/git/mfpub | 2 +- buildroot/share/git/mfrb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot/share/git/mfpub b/buildroot/share/git/mfpub index 48ddb21dcb..aa76498c0d 100755 --- a/buildroot/share/git/mfpub +++ b/buildroot/share/git/mfpub @@ -48,7 +48,7 @@ git clean -d -f # Push 'master' to the fork and make a proper PR... if [[ $BRANCH == "master" ]]; then - if [[ $$FORK == "MarlinFirmware" ]]; then + if [[ $FORK == "MarlinFirmware" ]]; then # Allow working directly with the main fork git push -f upstream diff --git a/buildroot/share/git/mfrb b/buildroot/share/git/mfrb index 1e7c26e531..954556d0e0 100755 --- a/buildroot/share/git/mfrb +++ b/buildroot/share/git/mfrb @@ -14,7 +14,7 @@ case "$#" in esac # If the branch isn't currently the PR target -if [[ ${INFO[4]} != ${INFO[5]} ]]; then +if [[ ${INFO[3]} != ${INFO[4]} ]]; then git fetch upstream git rebase upstream/${INFO[3]} && git rebase -i upstream/${INFO[3]} fi