From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Sat, 18 Jun 2011 06:47:59 +0000 (+0200)
Subject: git-svn: Disambiguate rev-list arguments to improve error message
X-Git-Tag: v1.7.6.1~58^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=eabd73a3b587615ca60e820dfa1b8802d1659db3;p=git.git

git-svn: Disambiguate rev-list arguments to improve error message

Add "--" in the "git rev-list" command line so that if there is a bug
and the revisions cannot be found, the error message is a bit less
cryptic.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Acked-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index 7849cfc14..1f1aa5710 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3154,9 +3154,9 @@ sub check_cherry_pick {
 	my $parents = shift;
 	my @ranges = @_;
 	my %commits = map { $_ => 1 }
-		_rev_list("--no-merges", $tip, "--not", $base, @$parents);
+		_rev_list("--no-merges", $tip, "--not", $base, @$parents, "--");
 	for my $range ( @ranges ) {
-		delete @commits{_rev_list($range)};
+		delete @commits{_rev_list($range, "--")};
 	}
 	for my $commit (keys %commits) {
 		if (has_no_changes($commit)) {