diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:24 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-05-09 00:37:24 +0900 |
commit | ce2a18f2b1dd71966c00109f3da42df64bb836dd (patch) | |
tree | a239d2ae98598d7824d8ca69717a29290a305937 /tmp-objdir.c | |
parent | Merge branch 'js/trace2-to-directory' (diff) | |
parent | replace: peel tag when passing a tag first to --graft (diff) | |
download | tgif-ce2a18f2b1dd71966c00109f3da42df64bb836dd.tar.xz |
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
Diffstat (limited to 'tmp-objdir.c')
0 files changed, 0 insertions, 0 deletions