diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2014-07-19 17:01:12 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-21 12:05:58 -0700 |
| commit | 0b05ab6f1bfa045f460ad5c40d87ef8c2965bf56 (patch) | |
| tree | cd5af7add60c952fe90aaeff9cc3a9cb0a7bd8d2 /builtin | |
| parent | b0ab2b71d0baa845e6920a3146df65f5cd296ea0 (diff) | |
| download | git-0b05ab6f1bfa045f460ad5c40d87ef8c2965bf56.tar.gz | |
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 <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/replace.c | 5 |
1 files changed, 5 insertions, 0 deletions
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); |