Code

git-svn.perl: close the edit for propedits even with no mods
authorSteven Walter <stevenrwalter@gmail.com>
Thu, 1 Dec 2011 02:37:27 +0000 (21:37 -0500)
committerEric Wong <normalperson@yhbt.net>
Thu, 1 Dec 2011 22:25:30 +0000 (14:25 -0800)
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>
git-svn.perl

index e30df22d89d97642f0b99c3a35ee0b2c5c062bb3..eeb83d375931df81bd87ca285c8d0741c14f33a2 100755 (executable)
@@ -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;