for-each-ref: introduce %(upstream:track[short])