summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Hariom Verma <hariom18599@gmail.com>2020-08-21 21:06:14 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-21 14:46:22 -0700
commit2c22e102f8cae598061be509344c6fdaf99c7db7 (patch)
tree1d1734e63ff9fc4518ae61bac9b1d2f5af6ea37e /builtin/merge-recursive.c
parentt6300: unify %(trailers) and %(contents:trailers) tests (diff)
downloadtgif-2c22e102f8cae598061be509344c6fdaf99c7db7.tar.xz
ref-filter: 'contents:trailers' show error if `:` is missing
The 'contents' atom does not show any error if used with 'trailers' atom and colon is missing before trailers arguments. e.g %(contents:trailersonly) works, while it shouldn't. It is definitely not an expected behavior. Let's fix this bug. Mentored-by: Christian Couder <chriscool@tuxfamily.org> Mentored-by: Heba Waly <heba.waly@gmail.com> Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Hariom Verma <hariom18599@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions