diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2011-06-18 08:47:59 +0200 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2011-06-28 03:26:08 +0000 |
| commit | eabd73a3b587615ca60e820dfa1b8802d1659db3 (patch) | |
| tree | a53847d974008d97ff3e69cd9122378749daec0d | |
| parent | 555bdc66eab0178d43c509ec53c1d97303675f90 (diff) | |
| download | git-eabd73a3b587615ca60e820dfa1b8802d1659db3.tar.gz | |
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>
| -rwxr-xr-x | git-svn.perl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.perl b/git-svn.perl index 7849cfc141..1f1aa57109 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)) { |