From: Eric Sunshine <sunshine@sunshineco.com>
To: Alexander Kuleshov <kuleshovmail@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: [PATCH RFC] add: Do not open editor if patch is empty
Date: Sun, 26 Apr 2015 14:39:06 -0400 [thread overview]
Message-ID: <CAPig+cTMWe4gnuMrx-aP1Zu+qr6UqmHFmJj2JoahtuxcDGLTQg@mail.gmail.com> (raw)
In-Reply-To: <1430067820-3349-1-git-send-email-kuleshovmail@gmail.com>
On Sun, Apr 26, 2015 at 1:03 PM, Alexander Kuleshov
<kuleshovmail@gmail.com> wrote:
> If we'll run 'git add -e <path>' on a path which has no
> difference with the current index, empty editor will open. This
> patch prevents this behaviour and checks that patch is not empty
> before an editor with patch will be opened.
>
> Signed-off-by: Alexander Kuleshov <kuleshovmail@gmail.com>
> ---
> diff --git a/builtin/add.c b/builtin/add.c
> index ee370b0..4fc6b13 100644
> --- a/builtin/add.c
> +++ b/builtin/add.c
> @@ -209,13 +209,13 @@ 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 (stat(file, &st))
> die_errno(_("Could not stat '%s'"), file);
> if (!st.st_size)
> die(_("Empty patch. Aborted."));
>
> + launch_editor(file, NULL, NULL);
But this breaks intended behavior[1] in which "git add -e" aborts with
message "Empty patch" if the user deletes everything from the patch
file in the editor.
[1]: c59cb03 (git-add: introduce --edit (to edit the diff vs. the
index), 2009-04-08)
> child.git_cmd = 1;
> child.argv = apply_argv;
> if (run_command(&child))
> --
> 2.3.3.611.g09038fc.dirty
prev parent reply other threads:[~2015-04-26 18:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-26 17:03 [PATCH RFC] add: Do not open editor if patch is empty Alexander Kuleshov
2015-04-26 18:39 ` Eric Sunshine [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAPig+cTMWe4gnuMrx-aP1Zu+qr6UqmHFmJj2JoahtuxcDGLTQg@mail.gmail.com \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kuleshovmail@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).