From: Steven Walter <stevenrwalter@gmail.com>
Date: Thu, 1 Dec 2011 02:37:27 +0000 (-0500)
Subject: git-svn.perl: close the edit for propedits even with no mods
X-Git-Tag: v1.7.9-rc0~88^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=93ccbba6ee5417ac97ce5e7fb8b7d9f1e080826e;p=git.git

git-svn.perl: close the edit for propedits even with no mods

It's legitimate to update the mergeinfo property without
actually changing any files.  This can happen when changes are
backported to a branch, and then that branch is merged back
into mainline.  We still want to record the updated mergeinfo
for book-keeping.

Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
---

diff --git a/git-svn.perl b/git-svn.perl
index e30df22d8..eeb83d375 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -5389,7 +5389,7 @@ sub apply_diff {
 			               $self->{mergeinfo});
 	}
 	$self->rmdirs if $_rmdir;
-	if (@$mods == 0) {
+	if (@$mods == 0 && !defined($self->{mergeinfo})) {
 		$self->abort_edit;
 	} else {
 		$self->close_edit;