builtin-apply: prevent non-explicit permission changes

A git patch that does not change the executable bit records the mode bits
on its "index" line.  "git apply" used to interpret this mode exactly the
same way as it interprets the mode recorded on "new mode" line, as the
wish by the patch submitter to set the mode to the one recorded on the
line.

The reason the mode does not agree between the submitter and the receiver
in the first place is because there is _another_ commit that only appears
on one side but not the other since their histories diverged, and that
commit changes the mode.  The patch has "index" line but not "new mode"
line because its change is about updating the contents without affecting
the mode.  The application of such a patch is an explicit wish by the
submitter to only cherry-pick the commit that updates the contents without
cherry-picking the commit that modifies the mode.  Viewed this way, the
current behaviour is problematic, even though the command does warn when
the mode of the path being patched does not match this mode, and a careful
user could detect this inconsistencies between the patch submitter and the
patch receiver.

This changes the semantics of the mode recorded on the "index" line;
instead of interpreting it as the submitter's wish to set the mode to the
recorded value, it merely informs what the mode submitter happened to
have, and the presense of the "index" line is taken as submitter's wish to
keep whatever the mode is on the receiving end.

This is based on the patch originally done by Alexander Potashev with a
minor fix; the tests are mine.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-apply.c b/builtin-apply.c
index c4978893122bbcfd80201fe937eb8433b29e1aa0..66437ed751e79593a9e8d3532d63d5b7afc17699 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -609,7 +609,7 @@ static int gitdiff_index(const char *line, struct patch *patch)
        memcpy(patch->new_sha1_prefix, line, len);
        patch->new_sha1_prefix[len] = 0;
        if (*ptr == ' ')
-               patch->new_mode = patch->old_mode = strtoul(ptr+1, NULL, 8);
+               patch->old_mode = strtoul(ptr+1, NULL, 8);
        return 0;
 }
 
@@ -2316,6 +2316,8 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s
        if (st_mode != patch->old_mode)
                fprintf(stderr, "warning: %s has type %o, expected %o\n",
                        old_name, st_mode, patch->old_mode);
+       if (!patch->new_mode)
+               patch->new_mode = st_mode;
        return 0;
 
  is_new:

diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
new file mode 100755 (executable)
index 0000000..adfcbb5
--- /dev/null
+++ b/t/t4129-apply-samemode.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+test_description='applying patch with mode bits'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+       echo original >file &&
+       git add file &&
+       test_tick &&
+       git commit -m initial &&
+       git tag initial &&
+       echo modified >file &&
+       git diff --stat -p >patch-0.txt &&
+       chmod +x file &&
+       git diff --stat -p >patch-1.txt
+'
+
+test_expect_success 'same mode (no index)' '
+       git reset --hard &&
+       chmod +x file &&
+       git apply patch-0.txt &&
+       test -x file
+'
+
+test_expect_success 'same mode (with index)' '
+       git reset --hard &&
+       chmod +x file &&
+       git add file &&
+       git apply --index patch-0.txt &&
+       test -x file &&
+       git diff --exit-code
+'
+
+test_expect_success 'same mode (index only)' '
+       git reset --hard &&
+       chmod +x file &&
+       git add file &&
+       git apply --cached patch-0.txt &&
+       git ls-files -s file | grep "^100755"
+'
+
+test_expect_success 'mode update (no index)' '
+       git reset --hard &&
+       git apply patch-1.txt &&
+       test -x file
+'
+
+test_expect_success 'mode update (with index)' '
+       git reset --hard &&
+       git apply --index patch-1.txt &&
+       test -x file &&
+       git diff --exit-code
+'
+
+test_expect_success 'mode update (index only)' '
+       git reset --hard &&
+       git apply --cached patch-1.txt &&
+       git ls-files -s file | grep "^100755"
+'
+
+test_done