diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-02-21 16:58:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-21 17:06:27 -0800 |
| commit | 24852d917104e294726c54803d5c9012997506ca (patch) | |
| tree | e8670207c18a832ceaaa2016896ad8d8ab8e19b7 | |
| parent | rev-list: documentation and test for --left/right-only (diff) | |
| download | tgif-24852d917104e294726c54803d5c9012997506ca.tar.xz | |
rev-list: --left/right-only are mutually exclusive
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | revision.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/revision.c b/revision.c index 0681c7c309..1fcaeb7902 100644 --- a/revision.c +++ b/revision.c @@ -1284,8 +1284,12 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (!strcmp(arg, "--left-right")) { revs->left_right = 1; } else if (!strcmp(arg, "--left-only")) { + if (revs->right_only) + die("--left-only is incompatible with --right-only"); revs->left_only = 1; } else if (!strcmp(arg, "--right-only")) { + if (revs->left_only) + die("--right-only is incompatible with --left-only"); revs->right_only = 1; } else if (!strcmp(arg, "--count")) { revs->count = 1; |