tree a239d2ae98598d7824d8ca69717a29290a305937
parent 1b403146616286e017d4fc1dfcbb056d56200655
parent ee521ec4cb09981c14ec32aca370b5ff5d15c4d9
author Junio C Hamano <gitster@pobox.com> 1557329844 +0900
committer Junio C Hamano <gitster@pobox.com> 1557329844 +0900

Merge branch 'cc/replace-graft-peel-tags'

When given a tag that points at a commit-ish, "git replace --graft"
failed to peel the tag before writing a replace ref, which did not
make sense because the old graft mechanism the feature wants to
mimick only allowed to replace one commit object with another.
This has been fixed.

* cc/replace-graft-peel-tags:
  replace: peel tag when passing a tag first to --graft
  replace: peel tag when passing a tag as parent to --graft
  t6050: redirect expected error output to a file
  t6050: use test_line_count instead of wc -l