pingpongboss / git-multi-pr Goto Github PK

Sometimes when I do git-multi-pr export the PR that gets exported includes, in the diff UI on github, changes that have nothing to do with my local commit(s) and seem to be changes from master beyond where my feature branch diverged.

This can be worked around by using sync & export but makes it difficult to build/test since it invalidates cache.

Would be nice to have in status

Similar to starting your commit with WIP, you should be able to start your commit with FIXUP and DRAFT.

FIXUP
The commit will be squashed to the previous commit when exporting to PRs.

DRAFT
The commit will be exported to a remote branch, but a PR will not be created for it.

For example, if there is
commit1
commit2
commit3
commit4

and we edit commit3, there is no need to re-export commit1 and commit 2. The commit3 and commit4 should be exported.

So that the first commit is not rebuilt, in case there is continuous-integration building.

The below command will fail if the ~/bin directory hasn't been created yet.

curl -o ~/bin/ok.sh https://raw.githubusercontent.com/whiteinge/ok.sh/master/ok.sh ; chmod +x ~/bin/ok.sh

This is the console output I get, ideally I would expect to see on the PR a message with the failure but I only see a 💨 or on my console what prevented the branch from being merged. Everything else works but I don't get the reason why it failed

Merging onto origin/master oldest PR #3611 (84697e5de9): dealing class cache on test env
If this is not the PR what you want to merge, then use `git-multi-pr edit` to reorder your local history, or `git-multi-pr sync` to sync your local queue.
Do you want to merge PR #3611 (84697e5de9)? [yes/NO]:
yes
Ensuring that the PR is open.
> /Users/danielnc/bin/ok.sh update_pull_request "foo/bar" "3612" base="master"
> /Users/danielnc/bin/ok.sh update_pull_request "foo/bar" "3612" state="open"
> /Users/danielnc/bin/ok.sh add_comment "foo/bar" "3611" ":unlock: Merging via `git-multi-pr merge`"
634871761 https://github.com/foo/bar/pull/3611#issuecomment-634871761
> /Users/danielnc/bin/ok.sh add_comment "foo/bar" "3611" ":dash:"
634871771 https://github.com/foo/bar/pull/3611#issuecomment-634871771
Check https://github.com/foo/bar/pull/3611 for the status on your merge.
When it is merged into master, sync your local queue with `git-multi-pr sync`.
Any subsequent PRs will have invalid diffs until you export again with `git-multi-pr export`.
--------------------------------------------------------------------------------------------------

Bash string processing and json does weird stuff with them.

The bash script thinks it's a folder separator.

Looks like a great tool, thanks!

It would be nice if you didn't assume that my ok.sh is installed in ~/bin. Seems to be this is what $PATH is for... Maybe ~/bin/ok.sh could be a fallback if ok.sh doesn't work?

save stupids like me

Right now I have to rewrite my PR description each time I git-multi-pr export.

blah