mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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
This commit is contained in:
commit
73bc4b4928
|
@ -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));
|
||||
|
|
|
@ -341,6 +341,22 @@ test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
|
|||
test new = "$(git show HEAD:file2)"
|
||||
'
|
||||
|
||||
test_expect_success "pull --rebase warns on --verify-signatures" '
|
||||
git reset --hard before-rebase &&
|
||||
git pull --rebase --verify-signatures . copy 2>err &&
|
||||
test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
|
||||
test new = "$(git show HEAD:file2)" &&
|
||||
test_i18ngrep "ignoring --verify-signatures for rebase" err
|
||||
'
|
||||
|
||||
test_expect_success "pull --rebase does not warn on --no-verify-signatures" '
|
||||
git reset --hard before-rebase &&
|
||||
git pull --rebase --no-verify-signatures . copy 2>err &&
|
||||
test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
|
||||
test new = "$(git show HEAD:file2)" &&
|
||||
test_i18ngrep ! "verify-signatures" err
|
||||
'
|
||||
|
||||
# add a feature branch, keep-merge, that is merged into master, so the
|
||||
# test can try preserving the merge commit (or not) with various
|
||||
# --rebase flags/pull.rebase settings.
|
||||
|
|
Loading…
Reference in a new issue