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

rebase.c: honour --no-gpg-sign

Browse Source 
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Đoàn Trần Công Danh
2020-04-03 17:28:02 +07:00
committed by Junio C Hamano
parent 274b9cc253
commit c241371c04
3 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/rebase.c
View File

@ -1592,6 +1592,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
options.allow_empty_message = 1;
git_config(rebase_config, &options);
/* options.gpg_sign_opt will be either "-S" or NULL */
gpg_sign = options.gpg_sign_opt ? "" : NULL;
FREE_AND_NULL(options.gpg_sign_opt);
if (options.use_legacy_rebase ||
!git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1))
@ -1822,10 +1825,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
if (options.empty != EMPTY_UNSPECIFIED)
imply_merge(&options, "--empty");
if (gpg_sign) {
free(options.gpg_sign_opt);
if (gpg_sign)
options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);
}
if (exec.nr) {
int i;