Commit 8febe654be29e0676476c9d23320a8944bd3f91a

Carlos Martín Nieto 2015-12-06T18:11:37

Merge pull request #3529 from mgorny/fix-checkout-test-umask checkout test: Apply umask to file-mode test as well

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/tests/checkout/index.c b/tests/checkout/index.c
index 9fa9018..8af3e56 100644
--- a/tests/checkout/index.c
+++ b/tests/checkout/index.c
@@ -298,7 +298,7 @@ void test_checkout_index__options_dir_modes(void)
 
 	/* File-mode test, since we're on the 'dir' branch */
 	cl_git_pass(p_stat("./testrepo/a/b.txt", &st));
-	cl_assert_equal_i_fmt(st.st_mode, GIT_FILEMODE_BLOB_EXECUTABLE, "%07o");
+	cl_assert_equal_i_fmt(st.st_mode, GIT_FILEMODE_BLOB_EXECUTABLE & ~um, "%07o");
 
 	git_commit_free(commit);
 }