mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace: remove signature when using --graft

Browse Source 
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>
This commit is contained in:
Christian Couder
2014-07-19 17:01:12 +02:00
committed by Junio C Hamano
parent b0ab2b71d0
commit 0b05ab6f1b
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/replace.c
View File

@ -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);