On Sun, Mar 15, 2015 at 01:33:07AM +0200, epilys wrote:
> diff --git a/builtin/log.c b/builtin/log.c
> index dd8f3fc..0194133 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");It looks like you indented here with four spaces instead of a tab. We prefer tabs in Git. > 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..4dd939b 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 And here as well. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
signature.asc
Description: Digital signature
