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>
Steven Walter committed
Nov 30, 2011 at 21:37 UTC
93ccbba6ee5417ac97ce5e7fb8b7d9f1e080826e
1 file changed
+1
-1
git-svn.perl
+1
-1
@@ -5389,7 +5389,7 @@ sub apply_diff {
5389
$self->{mergeinfo});
5390
}
5391
$self->rmdirs if $_rmdir;
5392
- if (@$mods == 0) {
5392
+ if (@$mods == 0 && !defined($self->{mergeinfo})) {
5393
$self->abort_edit;
5394
} else {
5395
$self->close_edit;