Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: Disambiguate rev-list arguments to improve error message
author
Michael Haggerty
<mhagger@alum.mit.edu>
Sat, 18 Jun 2011 06:47:59 +0000
(08:47 +0200)
committer
Eric Wong
<normalperson@yhbt.net>
Tue, 28 Jun 2011 03:26:08 +0000
(
03:26
+0000)
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>
git-svn.perl
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
555bdc6
)
diff --git
a/git-svn.perl
b/git-svn.perl
index 7849cfc141d384bc28479c2f37fd128c77fe0fbe..1f1aa5710988b179b3c92af1e11dc7ff72021062 100755
(executable)
--- 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)) {