mergetool: Add prompt to continue after failing to merge a file

diff --git a/git-svn.perl b/git-svn.perl
index 2abb7b5937266999e66a8217a02394f8deb29af7..86075ec616418f77e42dd72593a7efd00e1200c3 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -223,11 +223,13 @@ BEGIN
                            "but it is not a directory\n";
                }
                my $git_dir = delete $ENV{GIT_DIR};
-               chomp(my $cdup = command_oneline(qw/rev-parse --show-cdup/));
-               unless (length $cdup) {
-                       die "Already at toplevel, but $git_dir ",
-                           "not found '$cdup'\n";
-               }
+               my $cdup = undef;
+               git_cmd_try {
+                       $cdup = command_oneline(qw/rev-parse --show-cdup/);
+                       $git_dir = '.' unless ($cdup);
+                       chomp $cdup if ($cdup);
+                       $cdup = "." unless ($cdup && length $cdup);
+               } "Already at toplevel, but $git_dir not found\n";
                chdir $cdup or die "Unable to chdir up to '$cdup'\n";
                unless (-d $git_dir) {
                        die "$git_dir still not found after going to ",