Merge branch 'mg/track'

* mg/track:
Fix behavior with non-commit upstream references
Test tracking of non-commit upstreams

diff --cc remote.c
Simple merge

diff --cc t/t6040-tracking-info.sh
Simple merge