Merge branch 'jk/die-on-bogus-worktree-late'

diff --git a/builtin/add.c b/builtin/add.c
index ee370b059adfd106c70e2c4aa4df50663cb4a8ec..df5135bf62acabfa9f68793435c1576ba7c1a36a 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -209,7 +209,8 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
        if (run_diff_files(&rev, 0))
                die(_("Could not write patch"));
 
-       launch_editor(file, NULL, NULL);
+       if (launch_editor(file, NULL, NULL))
+               die(_("editing patch failed"));
 
        if (stat(file, &st))
                die_errno(_("Could not stat '%s'"), file);