diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-14 07:41:38 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-14 07:41:38 +0400 |
commit | de4971b50076b5ef901c2ae0bbee9dd2c14f06ea (patch) | |
tree | 658788d2fc9c41af2114851538a4ad8415ec8c46 | |
parent | 940c1bb0181cb20454bf3573134175f86983a0ce (diff) |
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.
-rw-r--r-- | apply.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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) |