fix assignation operator used instead of equality
git: fix missing argument to commit_pinning
git: fix argument order in call to merge_status

When we consider whether we should reset the branch or not, the
order in #merge_status was inverted which obviously led to
wrong results