Skip to content

Commit eabd73a

Browse files
mhaggerEric Wong
authored andcommitted
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 <[email protected]> Acked-by: Eric Wong <[email protected]>
1 parent 555bdc6 commit eabd73a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

git-svn.perl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3154,9 +3154,9 @@ sub check_cherry_pick {
31543154
my $parents = shift;
31553155
my @ranges = @_;
31563156
my %commits = map { $_ => 1 }
3157-
_rev_list("--no-merges", $tip, "--not", $base, @$parents);
3157+
_rev_list("--no-merges", $tip, "--not", $base, @$parents, "--");
31583158
for my $range ( @ranges ) {
3159-
delete @commits{_rev_list($range)};
3159+
delete @commits{_rev_list($range, "--")};
31603160
}
31613161
for my $commit (keys %commits) {
31623162
if (has_no_changes($commit)) {

0 commit comments

Comments
 (0)