Merge branch 'jk/add-e-kill-editor' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:09 +0000 (12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:09 +0000 (12:00 -0700)
commit8d5ef5a0d1da18a2eb55c976720a8e96642c1b0b
treeb1f242433912f04efc62a741cf1ae1657d8bad05
parenta3821a1ae5580ac9788d866c292376070d3e5133
parentcb64800d83ace6fecb8701151cfdb6ed0712702c
Merge branch 'jk/add-e-kill-editor' into maint

"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
builtin/add.c