diff options
| author | Eric Wong <normalperson@yhbt.net> | 2007-02-13 15:56:08 -0800 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2007-02-23 00:57:12 -0800 |
| commit | ce207c7ad1604c6afd5014051641e40f346a59c6 (patch) | |
| tree | 442bedd3c4916cf608b05bf77055f7e954b1b040 | |
| parent | a8ae26235ced15d8ce129a8ff72c558b8a567813 (diff) | |
| download | git-ce207c7ad1604c6afd5014051641e40f346a59c6.tar.gz git-ce207c7ad1604c6afd5014051641e40f346a59c6.tar.xz | |
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>
| -rwxr-xr-x | git-svn.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-svn.perl b/git-svn.perl index 09c0aba8e..66653f9eb 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>) { |