Merge branch 'fc/trivial'

diff --git a/builtin/diff.c b/builtin/diff.c
index bb84ba0e4694a6ef2cda7898ec9c61fa80bf74ae..2fb8c5dc0b6fdc97beb82f4dc3802a8f0dad8211 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -368,7 +368,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        }
        if (rev.prune_data.nr) {
                /* builtin_diff_b_f() */
-               GUARD_PATHSPEC(&rev.prune_data, PATHSPEC_FROMTOP);
+               GUARD_PATHSPEC(&rev.prune_data, PATHSPEC_FROMTOP | PATHSPEC_LITERAL);
                if (!path)
                        path = rev.prune_data.items[0].match;
                paths += rev.prune_data.nr;