apply: canonicalize modes read from patches

Git stores only canonical modes for blobs. So for a regular file, we
care about only "100644" or "100755" (depending only on the executable
bit), but never modes where the group or other permissions are more
exotic. So never "100664", "100700", etc. When a file in the working
tree has such a mode, we quietly turn it into one of the two canonical
modes, and that's what is stored both in the index and in tree objects.

However, we don't canonicalize modes we read from incoming patches in
git-apply. These may appear in a few lines:

  - "old mode" / "new mode" lines for mode changes

  - "new file mode" lines for newly created files

  - "deleted file mode" for removing files

For "new mode" and for "new file mode", this is harmless. The patch is
asking the result to have a certain mode, but:

  - when we add an index entry (for --index or --cached), it is
    canonicalized as we create the entry, via create_ce_mode().

  - for a working tree file, try_create_file() passes either 0777 or
    0666 to open(), so what you get depends only on your umask, not any
    other bits (aside from the executable bit) in the original mode.

However, for "old mode" and "deleted file mode", there is a minor
annoyance. We compare the patch's expected preimage mode with the
current state. But that current state is always going to be a canonical
mode itself:

  - updating an index entry via --cached will have the canonical mode in
    the index

  - for updating a working tree file, check_preimage() runs the mode
    through ce_mode_from_stat(), which does the usual canonicalization

So if the patch feeds a non-canonical mode, it's impossible for it to
match, and we will always complain with something like:

  file has type 100644, expected 100664

Since this is just a warning, the operation proceeds, but it's
confusing and annoying.

These cases should be pretty rare in practice. Git would never produce a
patch with non-canonical modes itself (since it doesn't store them).
And while we do accept patches from other programs, all of those lines
were invented by Git. So you'd need a program trying to be Git
compatible, but not handling canonicalization the same way. Reportedly
"quilt" is such a program.

We should canonicalize the modes as we read them so that the user never
sees the useless warning.

A few notes on the tests:

  - I've covered instances of all lines for completeness, even though
    the "new mode" / "new file mode" ones behave OK currently.

  - the tests apply patches to both the index and working tree, and
    check the result of both. Again, we know that all of these paths
    canonicalize anyway, but it's giving us extra coverage (although we
    are even less likely to have such a bug now since we canonicalize up
    front).

  - the test patches are missing "index" lines, which is also something
    Git would never produce. But they don't matter for the test, they do
    match the case from quilt we saw in the wild, and they avoid some
    sha1/sha256 complexity.

Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/apply.c b/apply.c
index 901b67e6255af4174a1e5a00cf01de4d2545d659..bfa80f6584da59ef3560148fbef0ae11e4700915 100644 (file)
--- a/apply.c
+++ b/apply.c
@@ -992,6 +992,7 @@ static int parse_mode_line(const char *line, int linenr, unsigned int *mode)
        *mode = strtoul(line, &end, 8);
        if (end == line || !isspace(*end))
                return error(_("invalid mode on line %d: %s"), linenr, line);
+       *mode = canon_mode(*mode);
        return 0;
 }
 

diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
index 4eb84440298552ec53520307641419a7f6d7fd77..d9a1084b5e6f2a531beaf329f88cbc86ad7ff1d2 100755 (executable)
--- a/t/t4129-apply-samemode.sh
+++ b/t/t4129-apply-samemode.sh
@@ -130,4 +130,66 @@ test_expect_success 'git apply respects core.fileMode' '
        test_grep ! "has type 100644, expected 100755" err
 '
 
+test_expect_success POSIXPERM 'patch mode for new file is canonicalized' '
+       cat >patch <<-\EOF &&
+       diff --git a/non-canon b/non-canon
+       new file mode 100660
+       --- /dev/null
+       +++ b/non-canon
+       +content
+       EOF
+       test_when_finished "git reset --hard" &&
+       (
+               umask 0 &&
+               git apply --index patch 2>err
+       ) &&
+       test_must_be_empty err &&
+       git ls-files -s -- non-canon >staged &&
+       test_grep "^100644" staged &&
+       ls -l non-canon >worktree &&
+       test_grep "^-rw-rw-rw" worktree
+'
+
+test_expect_success POSIXPERM 'patch mode for deleted file is canonicalized' '
+       test_when_finished "git reset --hard" &&
+       echo content >non-canon &&
+       git add non-canon &&
+       chmod 666 non-canon &&
+
+       cat >patch <<-\EOF &&
+       diff --git a/non-canon b/non-canon
+       deleted file mode 100660
+       --- a/non-canon
+       +++ /dev/null
+       @@ -1 +0,0 @@
+       -content
+       EOF
+       git apply --index patch 2>err &&
+       test_must_be_empty err &&
+       git ls-files -- non-canon >staged &&
+       test_must_be_empty staged &&
+       test_path_is_missing non-canon
+'
+
+test_expect_success POSIXPERM 'patch mode for mode change is canonicalized' '
+       test_when_finished "git reset --hard" &&
+       echo content >non-canon &&
+       git add non-canon &&
+
+       cat >patch <<-\EOF &&
+       diff --git a/non-canon b/non-canon
+       old mode 100660
+       new mode 100770
+       EOF
+       (
+               umask 0 &&
+               git apply --index patch 2>err
+       ) &&
+       test_must_be_empty err &&
+       git ls-files -s -- non-canon >staged &&
+       test_grep "^100755" staged &&
+       ls -l non-canon >worktree &&
+       test_grep "^-rwxrwxrwx" worktree
+'
+
 test_done