[PATCH 2/3] git-svn: Disambiguate rev-list arguments to improve error message
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Jun 18, 2011, 06:47 UTC
- Message-ID
- <1308379680-17188-3-git-send-email-mhagger@alum.mit.edu>
- In-Reply-To
- <1308379680-17188-1-git-send-email-mhagger@alum.mit.edu>
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> --- git-svn.perl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl index da3fea8..2cc9242 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -3141,9 +3141,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)) {
-- 1.7.5.4