From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Tan Subject: [PATCH 09/12] t4150: am with post-applypatch hook Date: Fri, 3 Jul 2015 02:16:37 +0800 Message-ID: <1435861000-25278-10-git-send-email-pyokagan@gmail.com> References: <1435861000-25278-1-git-send-email-pyokagan@gmail.com> Cc: Johannes Schindelin , Stefan Beller , Paul Tan , Junio C Hamano To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Thu Jul 02 20:17:51 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZAj3W-0006XS-AJ for gcvg-git-2@plane.gmane.org; Thu, 02 Jul 2015 20:17:50 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754084AbbGBSRo (ORCPT ); Thu, 2 Jul 2015 14:17:44 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:35723 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753997AbbGBSRe (ORCPT ); Thu, 2 Jul 2015 14:17:34 -0400 Received: by pdbci14 with SMTP id ci14so49037485pdb.2 for ; Thu, 02 Jul 2015 11:17:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FU+G82LRF3rMA9qJq7eM0rZlUy1fHHgIHx44/MySADc=; b=BhZqBTaS9u0CVPpp9z7h+AZaq2Hkp0y4yTZX5JAY+gv1nd7vHO8xZUwKphQHGrt+s6 nlUaRoeZMWRI6YCLf3JBMv5LC5jpzOw05LOaxoqSQbzaY+3poF7pUp5usU5bnrw4HW/J eOcH9naE9xYE/lyRtOB4K7mYUr424zm6uoyJOuAH77RbzcbBjiS4UawtdO7wKpM/6uHh MEPapGd2QJL1L2+lpU9DLmxDiCSPC/swrB1dwG8bTURkpqYDMopemRujlfxCAxC0+60q i8mb6T7T4ySxKvFSm38GmiPNLJblxE5Brd6ywPqnufEz5WGXEDIsUq83DElYL+5phRh1 XRvQ== X-Received: by 10.68.69.42 with SMTP id b10mr69678098pbu.38.1435861053787; Thu, 02 Jul 2015 11:17:33 -0700 (PDT) Received: from yoshi.pyokagan.tan ([116.86.132.138]) by mx.google.com with ESMTPSA id pr4sm6412670pbb.30.2015.07.02.11.17.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Jul 2015 11:17:33 -0700 (PDT) X-Mailer: git-send-email 2.5.0.rc1.81.gfe77482 In-Reply-To: <1435861000-25278-1-git-send-email-pyokagan@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Since d1c5f2a (Add git-am, applymbox replacement., 2005-10-07), git-am.sh will invoke the post-applypatch hook after the patch is applied and a commit is made. The exit code of the hook is ignored. Add tests for this hook. Cc: Junio C Hamano Signed-off-by: Paul Tan --- t/t4150-am.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/t/t4150-am.sh b/t/t4150-am.sh index dd6fe81..62b678c 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -275,6 +275,48 @@ test_expect_success 'am with failing pre-applypatch hook' ' test_cmp_rev first HEAD ' +test_expect_success 'am with post-applypatch hook' ' + test_when_finished "rm -f .git/hooks/post-applypatch" && + rm -fr .git/rebase-apply && + git reset --hard && + git checkout first && + mkdir -p .git/hooks && + cat >.git/hooks/post-applypatch <<-\EOF && + #!/bin/sh + git rev-parse HEAD >head.actual + git diff second >diff.actual + exit 0 + EOF + chmod +x .git/hooks/post-applypatch && + git am patch1 && + test_path_is_missing .git/rebase-apply && + test_cmp_rev second HEAD && + git rev-parse second >head.expected && + test_cmp head.expected head.actual && + git diff second >diff.expected && + test_cmp diff.expected diff.actual +' + +test_expect_success 'am with failing post-applypatch hook' ' + test_when_finished "rm -f .git/hooks/post-applypatch" && + rm -fr .git/rebase-apply && + git reset --hard && + git checkout first && + mkdir -p .git/hooks && + cat >.git/hooks/post-applypatch <<-\EOF && + #!/bin/sh + git rev-parse HEAD >head.actual + exit 1 + EOF + chmod +x .git/hooks/post-applypatch && + git am patch1 && + test_path_is_missing .git/rebase-apply && + git diff --exit-code second && + test_cmp_rev second HEAD && + git rev-parse second >head.expected && + test_cmp head.expected head.actual +' + test_expect_success 'setup: new author and committer' ' GIT_AUTHOR_NAME="Another Thor" && GIT_AUTHOR_EMAIL="a.thor@example.com" && -- 2.5.0.rc1.81.gfe77482