From f4046267dc7139c814e1a615d1a3c9857444749b Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Thu, 26 Jun 2014 09:16:12 -0400 Subject: [PATCH] checkout::conflict tests: only test owner mode The checkout::conflict type conflict tests were failing because they were overly assertive about the resultant mode, testing group & other bits, which failed miserably for people who had a umask less restrictive than 022. Only test the resultant owner bits. --- tests/checkout/conflict.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c index 2cb7c224d..16cc0943b 100644 --- a/tests/checkout/conflict.c +++ b/tests/checkout/conflict.c @@ -169,7 +169,7 @@ static void ensure_workdir_mode(const char *path, int mode) git_buf_joinpath(&fullpath, git_repository_workdir(g_repo), path)); cl_git_pass(p_stat(git_buf_cstr(&fullpath), &st)); - cl_assert_equal_i(mode, st.st_mode); + cl_assert_equal_i((mode & S_IRWXU), (st.st_mode & S_IRWXU)); git_buf_free(&fullpath); #endif