Commit 0145afe635b57bfbc3950030a572187b0644c0c5
2014-06-26T18:24:13
Merge pull request #2445 from ethomson/checkout_conflict_test checkout::conflict tests: only test owner mode
diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c
index 2cb7c22..16cc094 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