git-apply: normalize file mode when comparing with expected value

Sine git only saves the 'x' bit, we shouldn't compare the stat contents
directly.

diff --git a/apply.c b/apply.c
index cf40e5d4b668d59a96adb1e1a14c42fa6cce6370..c0cd1520db6ef1036678046fc5c8ada174155c49 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -1000,6 +1000,7 @@ static int check_patch(struct patch *patch)
                }
                if (patch->is_new < 0)
                        patch->is_new = 0;
+               st.st_mode = ntohl(create_ce_mode(st.st_mode));
                if (!patch->old_mode)
                        patch->old_mode = st.st_mode;
                if ((st.st_mode ^ patch->old_mode) & S_IFMT)