From ce207c7ad1604c6afd5014051641e40f346a59c6 Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 13 Feb 2007 15:56:08 -0800
Subject: [PATCH] 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>
---
git-svn.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-svn.perl b/git-svn.perl
index 09c0aba8ea6..66653f9eb44 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -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>) {