Merge branch 'master' of git://bogomips.org/git-svn

gitster · gitster · commit 4cb5d10b14dc · 2011-12-05T21:02:51.000-08:00
* 'master' of git://bogomips.org/git-svn:
  git-svn.perl: close the edit for propedits even with no mods
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -5389,7 +5389,7 @@ sub apply_diff {`
`5389`	`5389`	`$self->{mergeinfo});`
`5390`	`5390`	`}`
`5391`	`5391`	`$self->rmdirs if $_rmdir;`
`5392`		`- if (@$mods == 0) {`
	`5392`	`+ if (@$mods == 0 && !defined($self->{mergeinfo})) {`
`5393`	`5393`	`$self->abort_edit;`
`5394`	`5394`	`} else {`
`5395`	`5395`	`$self->close_edit;`