From: Junio C Hamano <gitster@pobox•com>
To: Felipe Contreras <felipe.contreras@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 5/6] add: trivial style cleanup
Date: Fri, 30 Aug 2013 20:37:11 -0700 [thread overview]
Message-ID: <xmqqhae6wmxk.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1377899810-1818-6-git-send-email-felipe.contreras@gmail.com> (Felipe Contreras's message of "Fri, 30 Aug 2013 16:56:49 -0500")
Felipe Contreras <felipe.contreras@gmail•com> writes:
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail•com>
> ---
> builtin/add.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/builtin/add.c b/builtin/add.c
> index 8266a9c..a1e1e0e 100644
> --- a/builtin/add.c
> +++ b/builtin/add.c
> @@ -336,7 +336,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
> git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
>
> if (read_cache() < 0)
> - die (_("Could not read the index"));
> + die(_("Could not read the index"));
>
> init_revisions(&rev, prefix);
> rev.diffopt.context = 7;
> @@ -347,11 +347,11 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
> DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
> out = open(file, O_CREAT | O_WRONLY, 0666);
> if (out < 0)
> - die (_("Could not open '%s' for writing."), file);
> + die(_("Could not open '%s' for writing."), file);
> rev.diffopt.file = xfdopen(out, "w");
> rev.diffopt.close_file = 1;
> if (run_diff_files(&rev, 0))
> - die (_("Could not write patch"));
> + die(_("Could not write patch"));
>
> launch_editor(file, NULL, NULL);
>
> @@ -364,7 +364,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
> child.git_cmd = 1;
> child.argv = apply_argv;
> if (run_command(&child))
> - die (_("Could not apply '%s'"), file);
> + die(_("Could not apply '%s'"), file);
>
> unlink(file);
> free(file);
Good. These often bothered me.
next prev parent reply other threads:[~2013-08-31 3:37 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-30 21:56 [PATCH 0/6] Trivial cleanups and fixes Felipe Contreras
2013-08-30 21:56 ` [PATCH 1/6] reset: trivial refactoring Felipe Contreras
2013-08-31 3:36 ` Junio C Hamano
2013-08-30 21:56 ` [PATCH 2/6] branch: trivial style fix Felipe Contreras
2013-08-31 3:36 ` Junio C Hamano
2013-08-30 21:56 ` [PATCH 3/6] rebase: trivial style fixes Felipe Contreras
2013-08-31 3:49 ` Junio C Hamano
2013-08-30 21:56 ` [PATCH 4/6] reset: trivial style cleanup Felipe Contreras
2013-08-31 3:49 ` Junio C Hamano
2013-08-30 21:56 ` [PATCH 5/6] add: " Felipe Contreras
2013-08-31 3:37 ` Junio C Hamano [this message]
2013-08-30 21:56 ` [PATCH 6/6] pull: trivial cleanup Felipe Contreras
2013-08-31 3:58 ` Junio C Hamano
2013-08-31 7:56 ` Felipe Contreras
2013-08-31 8:10 ` [PATCH] branch: use $curr_branch_short more René Scharfe
2013-08-31 8:22 ` Felipe Contreras
2013-08-31 9:11 ` René Scharfe
2013-08-31 9:22 ` Felipe Contreras
2013-08-31 10:28 ` René Scharfe
2013-08-31 17:20 ` Felipe Contreras
2013-09-08 15:21 ` René Scharfe
2013-09-08 23:13 ` Felipe Contreras
2013-09-15 11:42 ` René Scharfe
2013-09-15 13:02 ` Felipe Contreras
2013-09-03 16:56 ` Junio C Hamano
2013-09-08 15:21 ` [PATCH] pull: " René Scharfe
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=xmqqhae6wmxk.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=felipe.contreras@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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