diff options
| author |  Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2020-04-03 17:28:02 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-04-03 11:37:22 -0700 |
| commit | c241371c0445cee7116e36bbacb5b35069a81e64 (patch) | |
| tree | 2b1cbabe43a9d903cb18512321c6ae9e19aad6f2 /builtin/rebase.c | |
| parent | Git 2.26 (diff) | |
| download | tgif-c241371c0445cee7116e36bbacb5b35069a81e64.tar.xz | |
rebase.c: honour --no-gpg-sign
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index bff53d5d16..24b8893674 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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; |