From: Eric Wong <normalperson@yhbt.net>
Date: Fri, 19 Jan 2007 02:15:23 +0000 (-0800)
Subject: git-svn: fix a regression in dcommit that caused empty log messages
X-Git-Tag: v1.5.1-rc1~237
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=780a2f58e727386ae81223d7a5c16fbc55cfd9fa;p=git.git

git-svn: fix a regression in dcommit that caused empty log messages

Signed-off-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index 9d50d305c..b5a4cb05a 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -339,13 +339,14 @@ sub cmd_dcommit {
 		if ($_dry_run) {
 			print "diff-tree $d~1 $d\n";
 		} else {
+			my $log = get_commit_entry($d)->{log};
 			my $ra = $gs->ra;
 			my $pool = SVN::Pool->new;
 			my %ed_opts = ( r => $last_rev,
 			                ra => $ra->dup,
 			                svn_path => $ra->{svn_path} );
 			my $ed = SVN::Git::Editor->new(\%ed_opts,
-			                 $ra->get_commit_editor($::_message,
+			                 $ra->get_commit_editor($log,
 			                 sub { print "Committed r$_[0]\n";
 					       $last_rev = $_[0]; }),
 			                 $pool);