Unnecessary merge commits

[travislikestocode]

Hello

I'm having an issue with the latest githubrepo.rb. If my remote is head of my local repository when I push, it successfully merges the changes(which is awesome!).

However, the hook is also creating an empty merge commit entitled Merge remote-tracking branch 'origin/master' every time a config file changes, even if the local repo is ahead of the remote.

I'm using a repo cloned with SSH. Here's my config:

---
interval: 60
log: "/var/log/oxidized/log.log"
threads: 30
timeout: 20
retries: 3
rest: false
input:
  default: ssh
  debug: /var/lib/oxidized/debug
  ssh:
    secure: false
output:
  default: git
  git:
    user: configbackup
    email: configbackup@faithlife.com
    repo: "/var/lib/oxidized/NetworkBackup.git"
source:
  default: csv
  csv:
    file: /var/lib/oxidized/router.db
    delimiter: !ruby/regexp /:/
    map:
      name: 0
      model: 1
      username: 2
      password: 3
hooks:
  Github:
    type: githubrepo
    events: [post_store]
    remote_repo: "git@git:DevOps/NetworkBackup.git"

FYI: @ElvinEfendi