it seems that your patch could not pass t4052-stat-output.sh. I think it would be better if you could improve the specification for this change in Document/rev-list-options.txt 2015-03-15 8:43 GMT+08:00 Manos Pitsidianakis <epilys@xxxxxxx>: > In git-log, --graph shows a graphical representation of a continuous > commit history, and --no-walk shows discrete specified commits without > continuity. Using both doesn't make sense, so we forbid the combined use > of these flags. > > Signed-off-by: Manos Pitsidianakis <epilys@xxxxxxx> > --- > This is a microproject intended to complement my GSoC application. > builtin/log.c | 2 ++ > t/t4202-log.sh | 4 ++++ > 2 files changed, 6 insertions(+) > > diff --git a/builtin/log.c b/builtin/log.c > index dd8f3fc..5aaf964 100644 > --- a/builtin/log.c > +++ b/builtin/log.c > @@ -155,6 +155,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, > memset(&w, 0, sizeof(w)); > userformat_find_requirements(NULL, &w); > > + if (rev->graph && rev->no_walk) > + die("--graph and --no-walk are incompatible"); > if (!rev->show_notes_given && (!rev->pretty_given || w.notes)) > rev->show_notes = 1; > if (rev->show_notes) > diff --git a/t/t4202-log.sh b/t/t4202-log.sh > index 5f2b290..5d72713 100755 > --- a/t/t4202-log.sh > +++ b/t/t4202-log.sh > @@ -887,4 +887,8 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' ' > grep "^| | gpg: Good signature" actual > ' > > +test_expect_success 'forbid log --graph --no-walk' ' > + test_must_fail git log --graph --no-walk > +' > + > test_done > -- > 2.1.4 > > > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- 江东灿(Dongcan Jiang) Team of Search Engine & Web Mining School of Electronic Engineering & Computer Science Peking University, Beijing, 100871, P.R.China -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html