Reviewing merge request #16: Fix "ambiguous argument" error when remote branch has a different name

The check for unpushed changes assumed the remote repository had the same branch name as the local. I changed it to use magit-remote-branch-for and made magit-remote-branch-for return the local branch name if there's no "merge =" in the config for the branch.

This fixes the

fatal: ambiguous argument 'HEAD..remote/master': unknown revision

error on the branches I was getting it with.

Commits that would be merged:

Version 1
  • Version 1
  • cb458d5
  • 382fb0e
  • Use local branch name if there is no merge defined.

  • 30fb5ce
  • Use appropriate remote branch

Showing cb458d5-382fb0e

Comments

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository