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>
This commit is contained in:

committed by
Junio C Hamano

parent
15af58c1ad
commit
5e505257f2
@ -251,7 +251,6 @@ void diffcore_pickaxe(struct diff_options *o)
|
||||
}
|
||||
}
|
||||
|
||||
/* Might want to warn when both S and G are on; I don't care... */
|
||||
pickaxe(&diff_queued_diff, o, regexp, kws,
|
||||
(opts & DIFF_PICKAXE_KIND_G) ? diff_grep : has_changes);
|
||||
|
||||
|
Reference in New Issue
Block a user