From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Jun 2010 19:07:44 +0000 (-0700)
Subject: Merge branch 'jn/show-num-walks'
X-Git-Tag: v1.7.2-rc0~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a81f1a825bebe1b4d202832b804957d1547d7f60?hp=f526d120f649ec4426b559e94e09655b5a4f2b87

Merge branch 'jn/show-num-walks'

* jn/show-num-walks:
DWIM 'git show -5' to 'git show --do-walk -5'
---

diff --git a/revision.c b/revision.c
index 7847921658..540358184d 100644
--- a/revision.c
+++ b/revision.c
@@ -1162,18 +1162,22 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 
 	if (!prefixcmp(arg, "--max-count=")) {
 		revs->max_count = atoi(arg + 12);
+		revs->no_walk = 0;
 	} else if (!prefixcmp(arg, "--skip=")) {
 		revs->skip_count = atoi(arg + 7);
 	} else if ((*arg == '-') && isdigit(arg[1])) {
 	/* accept -<digit>, like traditional "head" */
 		revs->max_count = atoi(arg + 1);
+		revs->no_walk = 0;
 	} else if (!strcmp(arg, "-n")) {
 		if (argc <= 1)
 			return error("-n requires an argument");
 		revs->max_count = atoi(argv[1]);
+		revs->no_walk = 0;
 		return 2;
 	} else if (!prefixcmp(arg, "-n")) {
 		revs->max_count = atoi(arg + 2);
+		revs->no_walk = 0;
 	} else if (!prefixcmp(arg, "--max-age=")) {
 		revs->max_age = atoi(arg + 10);
 	} else if (!prefixcmp(arg, "--since=")) {