diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-07-14 15:35:36 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:56:07 -0700 |
| commit | 8f4f8f4579fe8cc630e118cc736de2b8d5cf8e34 (patch) | |
| tree | 84c3f6e022bd7c4e81d05ca725a469e72806d00e /builtin/diff.c | |
| parent | dad2586a6b30da902d5f1979221eccc474425a7a (diff) | |
| download | git-8f4f8f4579fe8cc630e118cc736de2b8d5cf8e34.tar.gz git-8f4f8f4579fe8cc630e118cc736de2b8d5cf8e34.tar.xz | |
guard against new pathspec magic in pathspec matching code
GUARD_PATHSPEC() marks pathspec-sensitive code, basically all those
that touch anything in 'struct pathspec' except fields "nr" and
"original". GUARD_PATHSPEC() is not supposed to fail. It's mainly to
help the designers catch unsupported codepaths.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index 9fc273d8c..6bb41aff5 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -367,6 +367,8 @@ 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); if (!path) path = rev.prune_data.items[0].match; paths += rev.prune_data.nr; |