diff options
| author | René Scharfe <l.s.r@web.de> | 2023-12-06 11:51:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-08 22:40:44 (GMT) |
| commit | fa518aef564a24649ee6d8bbb29ed9c183a4b7c5 (patch) | |
| tree | fb4791923f18fe94b7c0d8d2381cd1b7f0aaad11 /revision.c | |
| parent | 12418008679e3ab6bd57a8b974ac56b7c1bd5315 (diff) | |
| download | git-fa518aef564a24649ee6d8bbb29ed9c183a4b7c5.zip git-fa518aef564a24649ee6d8bbb29ed9c183a4b7c5.tar.gz git-fa518aef564a24649ee6d8bbb29ed9c183a4b7c5.tar.bz2 | |
revision: use die_for_incompatible_opt3() for - -graph/--reverse/--walk-reflogs
The revision option --reverse is incompatible with --walk-reflogs and
--graph is incompatible with both --reverse and --walk-reflogs. So they
are all incompatible with each other.
Use the function for checking three mutually incompatible options,
die_for_incompatible_opt3(), to perform this check in one place and
without repetition. This is shorter and clearer.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -3036,8 +3036,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s revs->grep_filter.ignore_locale = 1; compile_grep_patterns(&revs->grep_filter); - if (revs->reverse && revs->reflog_info) - die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--walk-reflogs"); if (revs->reflog_info && revs->limited) die("cannot combine --walk-reflogs with history-limiting options"); if (revs->rewrite_parents && revs->children.name) @@ -3048,11 +3046,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s /* * Limitations on the graph functionality */ - if (revs->reverse && revs->graph) - die(_("options '%s' and '%s' cannot be used together"), "--reverse", "--graph"); + die_for_incompatible_opt3(!!revs->graph, "--graph", + !!revs->reverse, "--reverse", + !!revs->reflog_info, "--walk-reflogs"); - if (revs->reflog_info && revs->graph) - die(_("options '%s' and '%s' cannot be used together"), "--walk-reflogs", "--graph"); if (revs->no_walk && revs->graph) die(_("options '%s' and '%s' cannot be used together"), "--no-walk", "--graph"); if (!revs->reflog_info && revs->grep_filter.use_reflog_filter) |