From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kacper Kornet Subject: [PATCH 2/3] t/t3701-add-interactive.sh: Add PERL prerequisite Date: Sat, 24 Aug 2013 06:01:45 +0200 Message-ID: <1377316906-70338-3-git-send-email-draenog@pld-linux.org> References: <1377316906-70338-1-git-send-email-draenog@pld-linux.org> To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Aug 24 06:02:04 2013 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 1VD534-0001sM-Jd for gcvg-git-2@plane.gmane.org; Sat, 24 Aug 2013 06:02:02 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754858Ab3HXEB5 (ORCPT ); Sat, 24 Aug 2013 00:01:57 -0400 Received: from carme.pld-linux.org ([193.239.45.140]:59353 "EHLO carme.pld-linux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754560Ab3HXEB4 (ORCPT ); Sat, 24 Aug 2013 00:01:56 -0400 Received: from draenog by carme.pld-linux.org with local (Exim 4.80.1) (envelope-from ) id 1VD52w-000IWR-TY for git@vger.kernel.org; Sat, 24 Aug 2013 06:01:54 +0200 X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1377316906-70338-1-git-send-email-draenog@pld-linux.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: The test 'patch mode ignores unmerged entries' uses git-add -p, so it depends on the perl code. Signed-off-by: Kacper Kornet --- t/t3701-add-interactive.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh index 9fab25c..8514220 100755 --- a/t/t3701-add-interactive.sh +++ b/t/t3701-add-interactive.sh @@ -330,7 +330,7 @@ test_expect_success PERL 'split hunk "add -p (edit)"' ' ! grep "^+15" actual ' -test_expect_success 'patch mode ignores unmerged entries' ' +test_expect_success PERL 'patch mode ignores unmerged entries' ' git reset --hard && test_commit conflict && test_commit non-conflict && -- 1.8.3.4