Browse Source

git-svn: include merges when calling rev-list for decommit

Merge commits can be created when following certain parents,
(most notably 'R' cases) and we definitely don't want to exclude
them.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
maint
Eric Wong 18 years ago
parent
commit
ce207c7ad1
  1. 2
      git-svn.perl

2
git-svn.perl

@ -278,7 +278,7 @@ sub cmd_dcommit { @@ -278,7 +278,7 @@ sub cmd_dcommit {
my $head = shift;
$head ||= 'HEAD';
my ($url, $rev, $uuid);
my ($fh, $ctx) = command_output_pipe(qw/rev-list --no-merges/, $head);
my ($fh, $ctx) = command_output_pipe('rev-list', $head);
my @refs;
my $c;
while (<$fh>) {

Loading…
Cancel
Save