From 0b05ab6f1bfa045f460ad5c40d87ef8c2965bf56 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 19 Jul 2014 17:01:12 +0200 Subject: replace: remove signature when using --graft It could be misleading to keep a signature in a replacement commit, so let's remove it. Note that there should probably be a way to sign the replacement commit created when using --graft, but this can be dealt with in another commit or patch series. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- builtin/replace.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'builtin/replace.c') diff --git a/builtin/replace.c b/builtin/replace.c index 74593596c6..52f73ce557 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -344,6 +344,11 @@ static int create_graft(int argc, const char **argv, int force) replace_parents(&buf, argc - 1, &argv[1]); + if (remove_signature(&buf)) { + warning(_("the original commit '%s' has a gpg signature."), old_ref); + warning(_("the signature will be removed in the replacement commit!")); + } + if (write_sha1_file(buf.buf, buf.len, commit_type, new)) die(_("could not write replacement commit for: '%s'"), old_ref); -- cgit v1.2.3