[PATCH] don't use default revision if a rev was specified

From

Dave Olszewski <cxreg@pobox.com>

Date

Mar 13, 2010, 22:47 UTC

Message-ID

<1268520425-31889-1-git-send-email-cxreg@pobox.com>

In-Reply-To

<4B9C086D.10004@lsrfire.ath.cx>

Signed-off-by: Dave Olszewski <cxreg@pobox.com>
---

>> I was testing a patch along the lines of
>> what Vladimir proposed, which was simply to not set the default rev if a
>> valid user-specified argument was found, whether or not it contains
>> commits.
>
>Sounds more like it.  How did the tests go?  Does it result in empty
>output (which is what I would expect from an empty reflog, now that I
>stopped and thought about it for a second)?

It seems to work ok(tm)

 revision.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/revision.c b/revision.c
index 29721ec..490b484 100644
--- a/revision.c
+++ b/revision.c
@@ -1334,7 +1334,7 @@ static void append_prune_data(const char ***prune_data, const char **av)
  */
 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
 {
-	int i, flags, left, seen_dashdash, read_from_stdin;
+	int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
 	const char **prune_data = NULL;
 
 	/* First, search for "--" */
@@ -1460,6 +1460,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 			append_prune_data(&prune_data, argv + i);
 			break;
 		}
+		else
+			got_rev_arg = 1;
 	}
 
 	if (prune_data)
@@ -1469,7 +1471,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 		revs->def = def;
 	if (revs->show_merge)
 		prepare_show_merge(revs);
-	if (revs->def && !revs->pending.nr) {
+	if (revs->def && !revs->pending.nr && !got_rev_arg) {
 		unsigned char sha1[20];
 		struct object *object;
 		unsigned mode;

-- 
1.7.0.2.202.g4e870.dirty