From: Christian Couder Date: Sat, 19 Jul 2014 15:01:14 +0000 (+0200) Subject: replace: check mergetags when using --graft X-Git-Tag: v2.1.0-rc0~2^2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/25a05a8cae263ca55e75d31336d09c8d9bc90be3?hp=25a05a8cae263ca55e75d31336d09c8d9bc90be3 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 Signed-off-by: Junio C Hamano ---