From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 May 2015 19:41:55 +0000 (-0700)
Subject: Merge branch 'jk/add-e-kill-editor'
X-Git-Tag: v2.5.0-rc0~87
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/29b2041c2a91d2f80afa9d4e0f6eeb77a3ff5bc6?hp=935d93764466c52cae7218c13bde93043bd609bd

Merge branch 'jk/add-e-kill-editor'

"git add -e" did not allow the user to abort the operation by
killing the editor.

* jk/add-e-kill-editor:
add: check return value of launch_editor
---

diff --git a/builtin/add.c b/builtin/add.c
index ee370b059a..df5135bf62 100644
--- 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);
diff --git a/t/t3702-add-edit.sh b/t/t3702-add-edit.sh
index 4ee47cc9a8..3cb74ca296 100755
--- a/t/t3702-add-edit.sh
+++ b/t/t3702-add-edit.sh
@@ -118,4 +118,11 @@ test_expect_success 'add -e' '
 
 '
 
+test_expect_success 'add -e notices editor failure' '
+	git reset --hard &&
+	echo change >>file &&
+	test_must_fail env GIT_EDITOR=false git add -e &&
+	test_expect_code 1 git diff --exit-code
+'
+
 test_done