git-remote-mediawiki: actually send empty comment when they're empty
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
ac4bbb41b2
commit
dcb1ea620d
|
@ -51,6 +51,9 @@ use constant EMPTY_CONTENT => "<!-- empty page -->\n";
|
||||||
# used to reflect file creation or deletion in diff.
|
# used to reflect file creation or deletion in diff.
|
||||||
use constant NULL_SHA1 => "0000000000000000000000000000000000000000";
|
use constant NULL_SHA1 => "0000000000000000000000000000000000000000";
|
||||||
|
|
||||||
|
# Used on Git's side to reflect empty edit messages on the wiki
|
||||||
|
use constant EMPTY_MESSAGE => '*Empty MediaWiki Message*';
|
||||||
|
|
||||||
my $remotename = $ARGV[0];
|
my $remotename = $ARGV[0];
|
||||||
my $url = $ARGV[1];
|
my $url = $ARGV[1];
|
||||||
|
|
||||||
|
@ -935,7 +938,7 @@ sub mw_import_revids {
|
||||||
|
|
||||||
my %commit;
|
my %commit;
|
||||||
$commit{author} = $rev->{user} || 'Anonymous';
|
$commit{author} = $rev->{user} || 'Anonymous';
|
||||||
$commit{comment} = $rev->{comment} || '*Empty MediaWiki Message*';
|
$commit{comment} = $rev->{comment} || EMPTY_MESSAGE;
|
||||||
$commit{title} = mediawiki_smudge_filename($page_title);
|
$commit{title} = mediawiki_smudge_filename($page_title);
|
||||||
$commit{mw_revision} = $rev->{revid};
|
$commit{mw_revision} = $rev->{revid};
|
||||||
$commit{content} = mediawiki_smudge($rev->{'*'});
|
$commit{content} = mediawiki_smudge($rev->{'*'});
|
||||||
|
@ -1050,6 +1053,10 @@ sub mw_push_file {
|
||||||
my $oldrevid = shift;
|
my $oldrevid = shift;
|
||||||
my $newrevid;
|
my $newrevid;
|
||||||
|
|
||||||
|
if ($summary eq EMPTY_MESSAGE) {
|
||||||
|
$summary = '';
|
||||||
|
}
|
||||||
|
|
||||||
my $new_sha1 = $diff_info_split[3];
|
my $new_sha1 = $diff_info_split[3];
|
||||||
my $old_sha1 = $diff_info_split[2];
|
my $old_sha1 = $diff_info_split[2];
|
||||||
my $page_created = ($old_sha1 eq NULL_SHA1);
|
my $page_created = ($old_sha1 eq NULL_SHA1);
|
||||||
|
|
Loading…
Reference in New Issue