diff options
| author | Jeff King <peff@peff.net> | 2015-05-12 21:21:58 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-12 20:25:08 -0700 |
| commit | cb64800d83ace6fecb8701151cfdb6ed0712702c (patch) | |
| tree | 230d77a33004a6cbf1417f99025cd04546c694e2 | |
| parent | 282616c72d1d08a77ca4fe1186cb708c38408d87 (diff) | |
| download | git-jk/add-e-kill-editor.tar.gz | |
add: check return value of launch_editorjk/add-e-kill-editor
When running "add -e", if launching the editor fails, we do
not notice and continue as if the output is what the user
asked for. The likely case is that the editor did not touch
the contents at all, and we end up adding everything.
Reported-by: Russ Cox <rsc@golang.org>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/add.c | 3 | ||||
| -rwxr-xr-x | t/t3702-add-edit.sh | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/builtin/add.c b/builtin/add.c index 459208a326..1c7436589e 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -207,7 +207,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 |