diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-25 12:54:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-25 12:54:22 -0700 |
| commit | dbd04eba01b05baee1c4ff39d00a0d6fd33a912a (patch) | |
| tree | 9db49ea856096dadb87c503cb7e08eea0888456a /revision.c | |
| parent | 257b204f2537e50c8c53326d188094203cd3515f (diff) | |
| parent | 695985f4837e7299dca10b5e45206dbd2c52c1e0 (diff) | |
| download | git-dbd04eba01b05baee1c4ff39d00a0d6fd33a912a.tar.gz | |
Merge branch 'dj/log-graph-with-no-walk'
"git log --graph --no-walk A B..." is a otcnflicting request that
asks nonsense; no-walk tells us show discrete points in the
history, while graph asks to draw connections between these
discrete points. Forbid the combination.
* dj/log-graph-with-no-walk:
revision: forbid combining --graph and --no-walk
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.c b/revision.c index ed3f6e967b..6399a0412c 100644 --- a/revision.c +++ b/revision.c @@ -2339,6 +2339,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s if (revs->reflog_info && revs->graph) die("cannot combine --walk-reflogs with --graph"); + if (revs->no_walk && revs->graph) + die("cannot combine --no-walk with --graph"); if (!revs->reflog_info && revs->grep_filter.use_reflog_filter) die("cannot use --grep-reflog without --walk-reflogs"); |