Home » Mailing list archives » git » 2009 » May » 25

[PATCH jc/maint-add-p-coalesce-fix] t3701: ensure correctly set up repository after skipped tests

Previous thread: [RFC PATCH] am: do not do any reset on --abort by Jeff King on Monday, May 25, 2009 - 3:43 am. (9 messages)

Next thread: [PATCH] gitk: update Italian translation by Michele Ballabio on Monday, May 25, 2009 - 6:13 am. (1 message)
[view original message]
From: Johannes Sixt
Subject: [PATCH jc/maint-add-p-coalesce-fix] t3701: ensure correctly set up repository after skipped tests
Date: Monday, May 25, 2009 - 5:07 am

From: Johannes Sixt <j6t@kdbg.org>

There are two tests that are skipped if file modes are not obeyed by the
file system. In this case, the subsequent test failed because the
repository was in an unexpected state. This corrects it.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 t/t3701-add-interactive.sh |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 5cdb83d..fd2a55a 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -165,6 +165,12 @@ test_expect_success FILEMODE 'stage mode but

 # end of tests disabled when filemode is not usable

+test_expect_success 'setup again' '
+	git reset --hard &&
+	test_chmod +x file &&
+	echo content >>file
+'
+
 # Write the patch file with a new line at the top and bottom
 cat >patch <<EOF
 index 180b47c..b6f2c08 100644
-- 
1.6.3.1.1240.gc4fde


--


[ message continues ]
[view original message]
From: Junio C Hamano
Subject: Re: [PATCH jc/maint-add-p-coalesce-fix] t3701: ensure correctly set up repository after skipped tests
Date: Monday, May 25, 2009 - 3:23 pm

Thanks.
--


[ message continues ]
Previous thread: [RFC PATCH] am: do not do any reset on --abort by Jeff King on Monday, May 25, 2009 - 3:43 am. (9 messages)

Next thread: [PATCH] gitk: update Italian translation by Michele Ballabio on Monday, May 25, 2009 - 6:13 am. (1 message)