From patchwork Sat Dec 29 21:37:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orgad Shaneh X-Patchwork-Id: 10745025 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 355DA1399 for ; Sat, 29 Dec 2018 21:38:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24B1D289B4 for ; Sat, 29 Dec 2018 21:38:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1618128AD5; Sat, 29 Dec 2018 21:38:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8B060289B4 for ; Sat, 29 Dec 2018 21:38:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728518AbeL2ViH (ORCPT ); Sat, 29 Dec 2018 16:38:07 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:43540 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726111AbeL2ViH (ORCPT ); Sat, 29 Dec 2018 16:38:07 -0500 Received: by mail-wr1-f65.google.com with SMTP id r10so23765257wrs.10 for ; Sat, 29 Dec 2018 13:38:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=raXQox0NLpNTPFerYzp01nOYFXLF7VkRO7qt1KETpVA=; b=AlXZVpSIR2N11YW3PRo2hoRkKEPAysKWJHYL0NMHYi0IUIMiRBXLiqfM3z88sWEaAw GA3+7Ime/OhnGrlLN+pqxhpqUmf7hroN7l82QOx4CNtuoLB/zb170Q3ZW08lEMf77g6H dTlSu1sywvsUY6EK0L6VV5l+HlZ/LuuTxRnKjeIXbmJ+KJ9X9CzZ7LhxRctWZOqjM+A1 NiE9RbwDe0FGBuSi+AcZFhYd5ORC6cfmEkklZsHA+T0Wm4bBZPbt2zSMeRUYY/FsjDTd /M8e43XcC3koaTS5UEZUfAVGEZJjf4f+zT5hJvINQiDwSbq89CNEQnjg7nnnJ+1hvZN5 HHuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=raXQox0NLpNTPFerYzp01nOYFXLF7VkRO7qt1KETpVA=; b=siRH2k9V4tQzmufNtZ1XGKD799S0dOCPSfkMeyrKA6xwayjLlemeWPDOQRlNQBktVs /ISaKAFlr09j3NPwlD/7KVe8G/NGqDLJ3w/BqSVZ2G+NuPvdT+9Cxy7ypYS/16rmuRxg jeQXSfiFCXjkoZpc9zUm3YVt8w+BlfWw++DBLIF4En8VvMFfG5lkmYYjKjxczNZPgTjx 2oFaYBgJZFHn7FOpaQDbX+XNW/ot1EXJPk0sAvWM8NzeI8FRBx8P0G7w+NANsICBjgvS cBaayDAwmBL7yrQaXns/j4hl+pjmQUd2dCfL0FEncDcl0TfkiXcNllkq+mW/xzd086nw WWBg== X-Gm-Message-State: AJcUukey2ue3lxUF6Z4A9j1dk68ZO7Aljor7B3WsCXcVqiVTOKr8V4w1 RKsQTe6pQY+EoPvjxxhDypmo0YOL X-Google-Smtp-Source: ALg8bN6dgwU40WS0rJAOL0EUpu2aoQv/CHdE/EONSsDa2Bz/5vqwXgKx2q8knbfdbeilN5XAwYtIPg== X-Received: by 2002:adf:f28d:: with SMTP id k13mr29931357wro.78.1546119483900; Sat, 29 Dec 2018 13:38:03 -0800 (PST) Received: from localhost.localdomain ([95.86.70.194]) by smtp.gmail.com with ESMTPSA id n9sm25282448wrx.80.2018.12.29.13.38.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Dec 2018 13:38:03 -0800 (PST) From: orgads@gmail.com To: git@vger.kernel.org Cc: Orgad Shaneh Subject: [PATCH 1/2] t5403: simplify by using a single repository Date: Sat, 29 Dec 2018 23:37:58 +0200 Message-Id: <20181229213759.12878-1-orgads@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Orgad Shaneh There is no strong reason to use separate clones to run these tests; just use a single test repository prepared with more modern test_commit shell helper function. While at it, replace three "awk '{print $N}'" on the same file with shell built-in "read" into three variables. Revert d42ec126aa717d00549e387d5a95fd55683c2e2c which is a workaround for Cygwin that is no longer needed. Signed-off-by: Orgad Shaneh --- t/t5403-post-checkout-hook.sh | 78 +++++++++++------------------------ 1 file changed, 23 insertions(+), 55 deletions(-) diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh index fc898c9eac..1d15a1031f 100755 --- a/t/t5403-post-checkout-hook.sh +++ b/t/t5403-post-checkout-hook.sh @@ -7,82 +7,50 @@ test_description='Test the post-checkout hook.' . ./test-lib.sh test_expect_success setup ' - echo Data for commit0. >a && - echo Data for commit0. >b && - git update-index --add a && - git update-index --add b && - tree0=$(git write-tree) && - commit0=$(echo setup | git commit-tree $tree0) && - git update-ref refs/heads/master $commit0 && - git clone ./. clone1 && - git clone ./. clone2 && - GIT_DIR=clone2/.git git branch new2 && - echo Data for commit1. >clone2/b && - GIT_DIR=clone2/.git git add clone2/b && - GIT_DIR=clone2/.git git commit -m new2 -' - -for clone in 1 2; do - cat >clone${clone}/.git/hooks/post-checkout <<'EOF' -#!/bin/sh -echo $@ > $GIT_DIR/post-checkout.args -EOF - chmod u+x clone${clone}/.git/hooks/post-checkout -done - -test_expect_success 'post-checkout runs as expected ' ' - GIT_DIR=clone1/.git git checkout master && - test -e clone1/.git/post-checkout.args + mkdir -p .git/hooks && + write_script .git/hooks/post-checkout <<-\EOF && + echo "$@" >.git/post-checkout.args + EOF + test_commit one && + test_commit two && + test_commit three ' test_expect_success 'post-checkout receives the right arguments with HEAD unchanged ' ' - old=$(awk "{print \$1}" clone1/.git/post-checkout.args) && - new=$(awk "{print \$2}" clone1/.git/post-checkout.args) && - flag=$(awk "{print \$3}" clone1/.git/post-checkout.args) && + test_when_finished "rm -f .git/post-checkout.args" && + git checkout master && + read old new flag <.git/post-checkout.args && test $old = $new && test $flag = 1 ' -test_expect_success 'post-checkout runs as expected ' ' - GIT_DIR=clone1/.git git checkout master && - test -e clone1/.git/post-checkout.args -' - test_expect_success 'post-checkout args are correct with git checkout -b ' ' - GIT_DIR=clone1/.git git checkout -b new1 && - old=$(awk "{print \$1}" clone1/.git/post-checkout.args) && - new=$(awk "{print \$2}" clone1/.git/post-checkout.args) && - flag=$(awk "{print \$3}" clone1/.git/post-checkout.args) && + test_when_finished "rm -f .git/post-checkout.args" && + git checkout -b new1 && + read old new flag <.git/post-checkout.args && test $old = $new && test $flag = 1 ' test_expect_success 'post-checkout receives the right args with HEAD changed ' ' - GIT_DIR=clone2/.git git checkout new2 && - old=$(awk "{print \$1}" clone2/.git/post-checkout.args) && - new=$(awk "{print \$2}" clone2/.git/post-checkout.args) && - flag=$(awk "{print \$3}" clone2/.git/post-checkout.args) && + test_when_finished "rm -f .git/post-checkout.args" && + git checkout two && + read old new flag <.git/post-checkout.args && test $old != $new && test $flag = 1 ' test_expect_success 'post-checkout receives the right args when not switching branches ' ' - GIT_DIR=clone2/.git git checkout master b && - old=$(awk "{print \$1}" clone2/.git/post-checkout.args) && - new=$(awk "{print \$2}" clone2/.git/post-checkout.args) && - flag=$(awk "{print \$3}" clone2/.git/post-checkout.args) && + test_when_finished "rm -f .git/post-checkout.args" && + git checkout master -- three.t && + read old new flag <.git/post-checkout.args && test $old = $new && test $flag = 0 ' -if test "$(git config --bool core.filemode)" = true; then -mkdir -p templates/hooks -cat >templates/hooks/post-checkout <<'EOF' -#!/bin/sh -echo $@ > $GIT_DIR/post-checkout.args -EOF -chmod +x templates/hooks/post-checkout - test_expect_success 'post-checkout hook is triggered by clone' ' + mkdir -p templates/hooks && + write_script templates/hooks/post-checkout <<-\EOF && + echo "$@" >$GIT_DIR/post-checkout.args + EOF git clone --template=templates . clone3 && test -f clone3/.git/post-checkout.args ' -fi test_done From patchwork Sat Dec 29 21:37:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Orgad Shaneh X-Patchwork-Id: 10745027 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C040A13B5 for ; Sat, 29 Dec 2018 21:38:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3754289B4 for ; Sat, 29 Dec 2018 21:38:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A810128AD5; Sat, 29 Dec 2018 21:38:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38D2F289B4 for ; Sat, 29 Dec 2018 21:38:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728523AbeL2ViJ (ORCPT ); Sat, 29 Dec 2018 16:38:09 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:37191 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727279AbeL2ViI (ORCPT ); Sat, 29 Dec 2018 16:38:08 -0500 Received: by mail-wr1-f66.google.com with SMTP id s12so23767036wrt.4 for ; Sat, 29 Dec 2018 13:38:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vewpZ9xQ4N6RC0wPq/sx8Zd1AV6VgFLTI9f1GfRrPAc=; b=iDbZumu5ByGs2d6rDb8ERE5pRkeCOP0k9oc8D7Fzgf5eQq8ktA315sI2Px4ILHYU2f Q+YS/hdKExVjqVn9hHfqwbRQxTxS5TYxGcnsQUSGScA/BXNrDmph/UfLlKukGcSO+T8Y M8ELuKMX1B+CEhIKk+TXbRS/JgOsKLpGYBq3Ep8gNhKvJX1tKihXKp3ZCQOegd2G1nuT 1DcF6LKN+qY3qy2Pb87dW7Sk8qfJcybBUDPQw9FWId9jYDTU139bJcRcAqh5wmGD+XtJ fF73k5YjQNaOfIVYgtZsKgNeRzo9W6ziBrhh/HukQk7jWvn55K0AeTSOdxLT5hY3mqnk PWtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vewpZ9xQ4N6RC0wPq/sx8Zd1AV6VgFLTI9f1GfRrPAc=; b=hNzEO2grW1TUhGSAIv0ZW3qYnnaDEWpQveZvuUxBsclmbm73vRUgeui7hMc9+6JdfY Tii9XmOlZ5szTObNho6PDRs9wtt2RwRKQKIrNGAA7KCM163DhBjCiUeokugwfjzJ6Gtc 7JEeytEkzH3A8nhsZlkzsZJ3YVTAxRNhhgKnZ+g0bM4PSPqtqoy8HUMSGYhNvRWm8OR1 HEC8/9xRhACwjLWIVi0qWw2pkp+vjiVsZ/Zq3YmuPGumWzRqF+mS3mLWtEG20cvuliuY SEESag6ygc8phYb0qk9vTEVxhw9HkPwayN7ARzGjn7Z1+KBp5Tw4l998UDRYdeCFDIFS DJrQ== X-Gm-Message-State: AJcUukey3Fms6FLbWGOfKpqbthbubXM08Ffla3rMh/gvKp0Y/R9EI8Go mWvnsQCsmfkfHK30y6EF65pibVHA X-Google-Smtp-Source: ALg8bN4aBPKn3WDCxb0udr6vpUtCI6PXSUNEi94MTJrBs98oAy4mekcim3v+x75X4jLKU/o6pL6zwA== X-Received: by 2002:adf:e7d0:: with SMTP id e16mr30588565wrn.142.1546119485942; Sat, 29 Dec 2018 13:38:05 -0800 (PST) Received: from localhost.localdomain ([95.86.70.194]) by smtp.gmail.com with ESMTPSA id n9sm25282448wrx.80.2018.12.29.13.38.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Dec 2018 13:38:05 -0800 (PST) From: orgads@gmail.com To: git@vger.kernel.org Cc: Orgad Shaneh Subject: [PATCH 2/2] Rebase: Run post-checkout hook on checkout Date: Sat, 29 Dec 2018 23:37:59 +0200 Message-Id: <20181229213759.12878-2-orgads@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181229213759.12878-1-orgads@gmail.com> References: <20181229213759.12878-1-orgads@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Orgad Shaneh The scripted version of rebase used to run this hook on the initial checkout. The transition to built-in introduced a regression. Signed-off-by: Orgad Shaneh --- builtin/rebase.c | 12 ++++++++++-- t/t5403-post-checkout-hook.sh | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/builtin/rebase.c b/builtin/rebase.c index b5c99ec10c..8402765a79 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -530,6 +530,7 @@ static int run_specific_rebase(struct rebase_options *opts) #define RESET_HEAD_DETACH (1<<0) #define RESET_HEAD_HARD (1<<1) +#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2) static int reset_head(struct object_id *oid, const char *action, const char *switch_to_branch, unsigned flags, @@ -537,6 +538,7 @@ static int reset_head(struct object_id *oid, const char *action, { unsigned detach_head = flags & RESET_HEAD_DETACH; unsigned reset_hard = flags & RESET_HEAD_HARD; + unsigned run_hook = flags & RESET_HEAD_RUN_POST_CHECKOUT_HOOK; struct object_id head_oid; struct tree_desc desc[2] = { { NULL }, { NULL } }; struct lock_file lock = LOCK_INIT; @@ -636,6 +638,10 @@ static int reset_head(struct object_id *oid, const char *action, ret = update_ref(reflog_head, "HEAD", oid, NULL, 0, UPDATE_REFS_MSG_ON_ERR); } + if (run_hook) + run_hook_le(NULL, "post-checkout", + oid_to_hex(orig ? orig : &null_oid), + oid_to_hex(oid), "1", NULL); leave_reset_head: strbuf_release(&msg); @@ -1465,7 +1471,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.switch_to); if (reset_head(&oid, "checkout", - options.head_name, 0, + options.head_name, + RESET_HEAD_RUN_POST_CHECKOUT_HOOK, NULL, buf.buf) < 0) { ret = !!error(_("could not switch to " "%s"), @@ -1539,7 +1546,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) strbuf_addf(&msg, "%s: checkout %s", getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name); if (reset_head(&options.onto->object.oid, "checkout", NULL, - RESET_HEAD_DETACH, NULL, msg.buf)) + RESET_HEAD_DETACH | RESET_HEAD_RUN_POST_CHECKOUT_HOOK, + NULL, msg.buf)) die(_("Could not detach HEAD")); strbuf_release(&msg); diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh index 1d15a1031f..a539ffc080 100755 --- a/t/t5403-post-checkout-hook.sh +++ b/t/t5403-post-checkout-hook.sh @@ -13,6 +13,8 @@ test_expect_success setup ' EOF test_commit one && test_commit two && + test_commit rebase-on-me && + git reset --hard HEAD^ && test_commit three ' @@ -44,6 +46,24 @@ test_expect_success 'post-checkout receives the right args when not switching br test $old = $new && test $flag = 0 ' +test_expect_success 'post-checkout is triggered on rebase' ' + test_when_finished "rm -f .git/post-checkout.args" && + git checkout -b rebase-test master && + rm -f .git/post-checkout.args && + git rebase rebase-on-me && + read old new flag <.git/post-checkout.args && + test $old != $new && test $flag = 1 +' + +test_expect_success 'post-checkout is triggered on rebase with fast-forward' ' + test_when_finished "rm -f .git/post-checkout.args" && + git checkout -b ff-rebase-test rebase-on-me^ && + rm -f .git/post-checkout.args && + git rebase rebase-on-me && + read old new flag <.git/post-checkout.args && + test $old != $new && test $flag = 1 +' + test_expect_success 'post-checkout hook is triggered by clone' ' mkdir -p templates/hooks && write_script templates/hooks/post-checkout <<-\EOF &&