Firmware2/buildroot/share/git
Scott Lahteine 1af05797d7 Improve mfadd helper script
- Use the original branch name if none is supplied
- Set the remote tracking to the source
- Accept User/Branch or User:Branch syntax
2020-02-01 00:46:22 -06:00
..
firstpush Patch up OPEN command in git scripts 2019-10-02 02:02:51 -05:00
ghpc Add 'ghpc' helper script 2019-05-27 21:06:43 -05:00
ghtp Whitespace cleanup 2019-06-08 06:40:44 -05:00
mfadd Improve mfadd helper script 2020-02-01 00:46:22 -06:00
mfclean Marlin bugfix-2.0.x Version/README 2017-08-31 17:56:08 -05:00
mfdoc Update mfdoc, mfpub 2020-01-21 05:21:49 -06:00
mffp Update git helper usage 2020-01-05 01:54:30 -06:00
mfhelp Add 'mfhelp' script 2019-07-09 21:40:20 -05:00
mfinfo Add dev-2.1.x to 'mfinfo' script 2019-12-16 03:33:22 -06:00
mfinit Tweak usage strings 2019-01-23 23:10:32 -06:00
mfnew Update git helper usage 2020-01-05 01:54:30 -06:00
mfpr Update git helper usage 2020-01-05 01:54:30 -06:00
mfpub Tweak mfpub stashing 2020-01-22 01:54:31 -06:00
mfqp Update git helper usage 2020-01-05 01:54:30 -06:00
mfrb Update git helper usage 2020-01-05 01:54:30 -06:00
mftest Fix Fysetc S6 FLASH_PAGE_SIZE and test build (#16560) 2020-01-14 15:36:47 -06:00
mfup Tweak usage strings 2019-01-23 23:10:32 -06:00
README.md Add 'ghpc' helper script 2019-05-27 21:06:43 -05:00

Marlin Github Helper Scripts

Introduction

A Pull Request is often just the start of a longer process of patching and refining the code until it's ready to merge. In that process it's common to accumulate a lot of commits, some of which are non-functional. Before merging any PR, excess commits need to be "squashed" and sometimes rearranged or reworked to produce a well-packaged set of changes and keep the commit history relatively clean.

In addition, while a PR is being worked on other commits may be merged, leading to conflicts that need resolution. For this reason, it's a best practice to periodically refresh the PR so the working copy closely reflects the final merge into upstream MarlinFirmware.

Merge vs Rebase

If you plan to create PRs and work on them after submission I recommend not using Github Desktop to sync and merge. Use the command line instead. Github Desktop provides a "merge" option, but I've found that "git rebase" is much cleaner and easier to manage. Merge applies new work after your commits, which buries them deeper in the commit history and makes it hard to bring them together as a final packaged unit. Rebase helpfully moves your commits to the tip of the branch, ensuring that your commits are adapted to the current code. This makes it easier to keep revising the commits in-place.

The Scripts

The following scripts can be used on any system with a GNU environment to speed up the process of working with Marlin branches and submitting changes to the project.

Remotes

File Description
mfadd [user] Add and Fetch Remote - Add and fetch another user's Marlin fork. Optionally, check out one of their branches.
mfinit Init Working Copy - Create a remote named 'upstream' (for use by the other scripts) pointing to the 'MarlinFirmware' fork. This only needs to be used once. Newer versions of Github Desktop may create upstream on your behalf.

Branches

File Description
mfnew [branch] New Branch - Creates a new branch based on upstream/[PR-target]. All new work should start with this command.
mffp Fast Push - Push the HEAD or a commit ID to upstream immediately. Requires privileged access to the MarlinFirmware repo.
firstpush Push the current branch to 'origin' -your fork on Github- and set it to track 'origin'. The branch needs to reside on Github before you can use it to make a PR.

Making / Amending PRs

File Description
mfpr Pull Request - Open the Compare / Pull Request page on Github for the current branch.
mfrb Do a git rebase then git rebase -i of the current branch onto upstream/[PR-target]. Use this to edit your commits anytime.
mfqp Quick Patch - Commit all current changes as "patch", then do mfrb, followed by git push -f if no conflicts need resolution.

Documentation

File Description
mfdoc Build the documentation with Jekyll and preview it locally.
mfpub Build and publish the documentation to marlinfw.org.

Utilities

File Description
ghtp -[h/s] Set the protocol to use for all remotes. -h for HTTPS, -s for SSL.
ghpc [-f] Push current branch to 'origin' or to the remote indicated by the error.
mfinfo This utility script is used by the other scripts to get:
- The upstream project ('MarlinFirmware')
- the 'origin' project (i.e., your Github username),
- the repository name ('Marlin'),
- the PR target branch ('bugfix-1.1.x'), and
- the current branch (or the first command-line argument).

By itself, mfinfo simply prints these values to the console.
mfclean      Prune your merged and remotely-deleted branches.

Examples

For a demonstration of these scripts see the video Marlin Live - May 9 2019. There is also an old write-up at #3193.