From 93ccbba6ee5417ac97ce5e7fb8b7d9f1e080826e Mon Sep 17 00:00:00 2001 From: Steven Walter Date: Wed, 30 Nov 2011 21:37:27 -0500 Subject: [PATCH] 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 Acked-by: Eric Wong --- git-svn.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.26.2