diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-20 11:01:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-20 11:01:00 -0700 |
| commit | 73bc4b4928e0111aa97c9963535223abb6fb2545 (patch) | |
| tree | f6178690acea2486b67b59c2c625a1a3ff0f0c33 /builtin | |
| parent | 8d6a7e9a198488a1594cd178240fb56085129c78 (diff) | |
| parent | c57e501c51d6b76ce30658b94ee4a5dc6ac27f3e (diff) | |
| download | git-73bc4b4928e0111aa97c9963535223abb6fb2545.tar.gz git-73bc4b4928e0111aa97c9963535223abb6fb2545.tar.xz | |
Merge branch 'ah/no-verify-signature-with-pull-rebase'
"git pull --rebase --verify-signature" learned to warn the user
that "--verify-signature" is a no-op when rebasing.
* ah/no-verify-signature-with-pull-rebase:
pull: warn on --verify-signatures with --rebase
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pull.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 1d7333c8a..897a7f4e4 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -815,6 +815,9 @@ static int run_rebase(const unsigned char *curr_head, argv_array_push(&args, "--no-autostash"); else if (opt_autostash == 1) argv_array_push(&args, "--autostash"); + if (opt_verify_signatures && + !strcmp(opt_verify_signatures, "--verify-signatures")) + warning(_("ignoring --verify-signatures for rebase")); argv_array_push(&args, "--onto"); argv_array_push(&args, sha1_to_hex(merge_head)); |