path: root/builtin/replace.c
diff options
authorChristian Couder <>2014-07-19 15:01:12 (GMT)
committerJunio C Hamano <>2014-07-21 19:05:58 (GMT)
commit0b05ab6f1bfa045f460ad5c40d87ef8c2965bf56 (patch)
treecd5af7add60c952fe90aaeff9cc3a9cb0a7bd8d2 /builtin/replace.c
parentb0ab2b71d0baa845e6920a3146df65f5cd296ea0 (diff)
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 <>
Diffstat (limited to 'builtin/replace.c')
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/replace.c b/builtin/replace.c
index 7459359..52f73ce 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);