Browse Source

Fix mfrb and mfpub

Scott Lahteine 8 years ago
parent
commit
c0f1052efb
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      buildroot/share/git/mfpub
  2. 1
    1
      buildroot/share/git/mfrb

+ 1
- 1
buildroot/share/git/mfpub View File

48
 # Push 'master' to the fork and make a proper PR...
48
 # Push 'master' to the fork and make a proper PR...
49
 if [[ $BRANCH == "master" ]]; then
49
 if [[ $BRANCH == "master" ]]; then
50
 
50
 
51
-  if [[ $$FORK == "MarlinFirmware" ]]; then
51
+  if [[ $FORK == "MarlinFirmware" ]]; then
52
 
52
 
53
     # Allow working directly with the main fork
53
     # Allow working directly with the main fork
54
     git push -f upstream
54
     git push -f upstream

+ 1
- 1
buildroot/share/git/mfrb View File

14
 esac
14
 esac
15
 
15
 
16
 # If the branch isn't currently the PR target
16
 # If the branch isn't currently the PR target
17
-if [[ ${INFO[4]} != ${INFO[5]} ]]; then
17
+if [[ ${INFO[3]} != ${INFO[4]} ]]; then
18
   git fetch upstream
18
   git fetch upstream
19
   git rebase upstream/${INFO[3]} && git rebase -i upstream/${INFO[3]}
19
   git rebase upstream/${INFO[3]} && git rebase -i upstream/${INFO[3]}
20
 fi
20
 fi

Loading…
Cancel
Save