Can you also add a test to https://github.com/matplotlib/matplotlib/blob/master/lib/matplotlib/tests/test_axes.py ?

something like

@cleanup
def test_eventplot_legend():
    # your code snippet from the bug report

Can you rebase and squash the first two commits together?

When you rebase, you need to force push (git push --force) and not pull again or you'll get two copies of your commits (new from you and old from GitHub).

Current coverage is 62.11% (diff: 100%)

Merging #7676 into master will increase coverage by 0.03%

@@             master      #7676   diff @@
==========================================
  Files           174        174          
  Lines         56021      56021          
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
+ Hits          34773      34795    +22   
+ Misses        21248      21226    -22   
  Partials          0          0          

Powered by Codecov. Last update ab98852...ad74d47

Think this all went horrible wrong (I hate now git to its guts), how to best clean up this mess:

• Delete this pull request
• Create a new one (with only the useful changes from above)
• Rebase if necessary

A new PR isn't necessary; just a rebase (and force push) will do. I can do that for you (you will need to reset your local copy.)

I would say I have done enough damage already and ask you kindly to do the rebase and force/push.

BTW, your name on commits is sometimes nepix32 and sometimes your email; what is the correct name you wish to use? (configure this with git config --global user.name 'The name to use', but it only affects new commits.)

nepix32 shall be user.name, thanks for notice. Should be configured properly now.

I updated the PR; on your computer,

$ git status
# Check for any changes you want to save (commit to a branch or stash them)
$ git fetch origin
$ git checkout nepix32-patch-1
$ git reset --hard origin/nepix32-patch-1

Have done everything down to git reset ... and things look properly now locally. What is the correct way now to synchronize my local copy with the fork of matplotlib without breaking everything again? git push?

I replaced the branch on your GitHub fork and the commands I gave above reset your local copy to match the fork. Everything should be in sync (as far as this PR/branch is concerned.)

Ok, I see, was looking at the forks master. In ...patch... everything is fine. What do you recommend to reset the master in the fork to look exactly as the one in upstream?

$ git checkout master
$ git reset --hard upstream/master
$ git push --force origin master

should get your local copy of master in sync with the version of here that your local copy believes to be the latest and sync your fork with that.

In the future, (or now just to be sure you have the latest commit)

$ git checkout master
$ git fetch upstream
$ git merge upstream/master
$ git push origin master

should be a fast-forward merge that just moves master "up" to the latest commit.

Hmmm... still have changes in origin/master I cannot get rid of going back to a commit before. But anyway, many thanks for helping me to deal with git!

Feel free to stop by our Gitter room for some help.

Looks good to me.

And adds tests to previously untested code path!

Thanks for the patch!