Re: [PATCH v2] pull: make --rebase --verify-signatures illegal
From: Junio C Hamano <hidden>
Date: 2016-06-16 02:19:04
Alexander 'z33ky' Hirsch [off-list ref] writes:
Previously git-pull would silently ignore the --verify-signatures option.
I do not see a point of making it error out. Adding a warning about the option being ignored might be a worthwhile thing to do (e.g. it may solicit responses from those who have been depending on it not erroring out, saying "these warnings are pointless and noisy--here is my valid use case that ends up passing --rebase and --v-s at the same time"), though.
quoted hunk
Signed-off-by: Alexander 'z33ky' Hirsch <redacted> --- I made the error-message conform to the CodingGuidelines (removed capitalization and full stop). Also, in the previous mail I said that I proposed a patch for git-pull last December, when I actually meant git-rebase. builtin/pull.c | 2 ++ t/t5520-pull.sh | 14 ++++++++++++++ 2 files changed, 16 insertions(+)diff --git a/builtin/pull.c b/builtin/pull.c index d98f481..b6e1507 100644 --- a/builtin/pull.c +++ b/builtin/pull.c@@ -809,6 +809,8 @@ 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") == 0) + die(_("the --verify-signatures option does not work for --rebase")); argv_array_push(&args, "--onto"); argv_array_push(&args, sha1_to_hex(merge_head));diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 739c089..cb8f741 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh@@ -341,6 +341,20 @@ test_expect_success 'branch.to-rebase.rebase should override pull.rebase' ' test new = "$(git show HEAD:file2)" ' +test_expect_success "pull --rebase --verify-signatures is illegal" ' + git reset --hard before-rebase && + test_must_fail git pull --rebase --verify-signatures . copy 2>err && + test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" && + test_i18ngrep "The --verify-signatures option does not work for --rebase." err +' + +test_expect_success "pull --rebase --no-verify-signatures" ' + git reset --hard before-rebase && + git pull --rebase --no-verify-signatures . copy && + test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" && + test new = "$(git show HEAD:file2)" +' + # 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.