diff: properly error out when combining multiple pickaxe options
authorStefan Beller <sbeller@google.com>
Thu, 4 Jan 2018 22:50:43 +0000 (14:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Jan 2018 23:02:40 +0000 (15:02 -0800)
commit5e505257f2651647c072f9c61fdc5dd52bbce8b2
tree57327f342244e20dbc8d1dc5f6932343eea13de4
parent15af58c1adba431c216e2a45fa0d22944560ba02
diff: properly error out when combining multiple pickaxe options

In f506b8e8b5 (git log/diff: add -G<regexp> that greps in the patch text,
2010-08-23) we were hesitant to check if the user requests both -S and
-G at the same time. Now that the pickaxe family also offers --find-object,
which looks slightly more different than the former two, let's add a check
that those are not used at the same time.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c
diffcore-pickaxe.c