diff options
| author |  Christian Couder <chriscool@tuxfamily.org> | 2014-07-19 17:01:14 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-07-21 12:06:49 -0700 |
| commit | 25a05a8cae263ca55e75d31336d09c8d9bc90be3 (patch) | |
| tree | 3d84af0f88b7dcb76e62871d597c03c39cd7b28f /git-merge-one-file.sh | |
| parent | replace: add test for --graft with signed commit (diff) | |
| download | tgif-25a05a8cae263ca55e75d31336d09c8d9bc90be3.tar.xz | |
replace: check mergetags when using --graft
When using --graft, with a mergetag in the original
commit, we should check that the commit pointed to by
the mergetag is still a parent of then new commit we
create, otherwise the mergetag could be misleading.
If the commit pointed to by the mergetag is no more
a parent of the new commit, we could remove the
mergetag, but in this case there is a good chance
that the title or other elements of the commit might
also be misleading. So let's just error out and
suggest to use --edit instead on the commit.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions