git-svn: include merges when calling rev-list for decommit
authorEric Wong <normalperson@yhbt.net>
Tue, 13 Feb 2007 23:56:08 +0000 (15:56 -0800)
committerEric Wong <normalperson@yhbt.net>
Fri, 23 Feb 2007 08:57:12 +0000 (00:57 -0800)
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>
git-svn.perl

index 09c0aba8ea65f250277c9238c7f74994a77fa551..66653f9eb44ad2f834ccd8d53d59540c4d662df7 100755 (executable)
@@ -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>) {