git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Beller <sbeller@google.com>
To: Christian Couder <christian.couder@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
	"Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Karsten Blees" <karsten.blees@gmail.com>,
	"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
	"Eric Sunshine" <sunshine@sunshineco.com>,
	"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
	"Johannes Sixt" <j6t@kdbg.org>, "René Scharfe" <l.s.r@web.de>,
	"Christian Couder" <chriscool@tuxfamily.org>
Subject: Re: [PATCH v9 03/41] builtin/apply: make apply_patch() return -1 or -128 instead of die()ing
Date: Mon, 1 Aug 2016 09:16:02 -0700	[thread overview]
Message-ID: <CAGZ79kY+VHLspQBm+cTarY8NR2_iOewUiVZVv79DHLVsv7v-Qg@mail.gmail.com> (raw)
In-Reply-To: <20160730172509.22939-4-chriscool@tuxfamily.org>

On Sat, Jul 30, 2016 at 10:24 AM, Christian Couder
<christian.couder@gmail.com> wrote:

> + * Try to apply a patch.
> + *
> + * Returns:
> + *  -128 if a bad error happened (like patch unreadable)
> + *  -1 if patch did not apply and user cannot deal with it
> + *   0 if the patch applied
> + *   1 if the patch did not apply but user might fix it

I stopped and wondered when reading this comment,
what the difference between -1 and 1 is, as the user is
not part of this function.

When reading the code, this makes sense, though.
So -1 is returned when the user set `apply_with_reject`,
1 otherwise? So the user told us upfront how to deal with
certain errors.

What is a "bad" error, that generates a -128?
(Only when the patch is not syntactically correct? Or are there
other -128 errors as well?)

Maybe:
 Returns zero on success,
 non zero for failing to apply a patch
 negative values for hard errors, e.g. unreadable patc.

Though this is less precise, as it doesn't differentiate between
-1 and -128. I dunno.

(These are just musings that should not stop going
forward with this patch, just some thoughts on the precision
of a comment)

Thanks,
Stefan

  reply	other threads:[~2016-08-01 16:43 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-30 17:24 [PATCH v9 00/41] libify apply and use lib in am, part 2 Christian Couder
2016-07-30 17:24 ` [PATCH v9 01/41] apply: make some names more specific Christian Couder
2016-07-30 17:24 ` [PATCH v9 02/41] apply: move 'struct apply_state' to apply.h Christian Couder
2016-07-30 17:24 ` [PATCH v9 03/41] builtin/apply: make apply_patch() return -1 or -128 instead of die()ing Christian Couder
2016-08-01 16:16   ` Stefan Beller [this message]
2016-07-30 17:24 ` [PATCH v9 04/41] builtin/apply: read_patch_file() return -1 " Christian Couder
2016-08-01 16:24   ` Stefan Beller
2016-07-30 17:24 ` [PATCH v9 05/41] builtin/apply: make find_header() return -128 " Christian Couder
2016-07-30 17:24 ` [PATCH v9 06/41] builtin/apply: make parse_chunk() return a negative integer on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 07/41] builtin/apply: make parse_single_patch() return -1 " Christian Couder
2016-07-30 17:24 ` [PATCH v9 08/41] builtin/apply: make parse_whitespace_option() return -1 instead of die()ing Christian Couder
2016-07-30 17:24 ` [PATCH v9 09/41] builtin/apply: make parse_ignorewhitespace_option() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 10/41] builtin/apply: move init_apply_state() to apply.c Christian Couder
2016-07-30 17:24 ` [PATCH v9 11/41] apply: make init_apply_state() return -1 instead of exit()ing Christian Couder
2016-07-30 17:24 ` [PATCH v9 12/41] builtin/apply: make check_apply_state() return -1 instead of die()ing Christian Couder
2016-07-30 17:24 ` [PATCH v9 13/41] builtin/apply: move check_apply_state() to apply.c Christian Couder
2016-07-30 17:24 ` [PATCH v9 14/41] builtin/apply: make apply_all_patches() return 128 or 1 on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 15/41] builtin/apply: make parse_traditional_patch() return -1 " Christian Couder
2016-07-30 17:24 ` [PATCH v9 16/41] builtin/apply: make gitdiff_*() return 1 at end of header Christian Couder
2016-07-30 17:24 ` [PATCH v9 17/41] builtin/apply: make gitdiff_*() return -1 on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 18/41] builtin/apply: change die_on_unsafe_path() to check_unsafe_path() Christian Couder
2016-07-30 17:24 ` [PATCH v9 19/41] builtin/apply: make build_fake_ancestor() return -1 on error Christian Couder
2016-07-30 17:24 ` [PATCH v9 20/41] builtin/apply: make remove_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 21/41] builtin/apply: make add_conflicted_stages_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 22/41] builtin/apply: make add_index_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 23/41] builtin/apply: make create_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 24/41] builtin/apply: make write_out_one_result() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 25/41] builtin/apply: make write_out_results() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 26/41] builtin/apply: make try_create_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 27/41] builtin/apply: make create_one_file() " Christian Couder
2016-07-30 17:24 ` [PATCH v9 28/41] builtin/apply: rename option parsing functions Christian Couder
2016-07-30 17:24 ` [PATCH v9 29/41] apply: rename and move opt constants to apply.h Christian Couder
2016-07-30 17:24 ` [PATCH v9 31/41] apply: make some parsing functions static again Christian Couder
2016-07-30 17:25 ` [PATCH v9 32/41] apply: use error_errno() where possible Christian Couder
2016-07-30 17:25 ` [PATCH v9 33/41] environment: add set_index_file() Christian Couder
2016-08-01 17:24   ` Stefan Beller
2016-08-01 20:37     ` Junio C Hamano
2016-08-01 20:40       ` Junio C Hamano
2016-08-03  6:57         ` Christian Couder
2016-08-03  6:41     ` Christian Couder
2016-07-30 17:25 ` [PATCH v9 34/41] write_or_die: use warning() instead of fprintf(stderr, ...) Christian Couder
2016-07-30 17:25 ` [PATCH v9 35/41] apply: make it possible to silently apply Christian Couder
2016-08-01 22:05   ` Junio C Hamano
2016-07-30 17:25 ` [PATCH v9 36/41] apply: don't print on stdout in verbosity_silent mode Christian Couder
2016-07-30 17:25 ` [PATCH v9 37/41] usage: add set_warn_routine() Christian Couder
2016-07-30 17:25 ` [PATCH v9 38/41] usage: add get_error_routine() and get_warn_routine() Christian Couder
2016-07-30 17:25 ` [PATCH v9 39/41] apply: change error_routine when silent Christian Couder
2016-08-01 16:58   ` Stefan Beller
2016-08-08 11:31     ` Christian Couder
2016-07-30 17:25 ` [PATCH v9 40/41] apply: refactor `git apply` option parsing Christian Couder
2016-07-30 17:25 ` [PATCH v9 41/41] builtin/am: use apply api in run_apply() Christian Couder
2016-07-30 19:50 ` [PATCH v9 00/41] libify apply and use lib in am, part 2 Christian Couder
2016-08-01 22:30   ` Junio C Hamano

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=CAGZ79kY+VHLspQBm+cTarY8NR2_iOewUiVZVv79DHLVsv7v-Qg@mail.gmail.com \
    --to=sbeller@google.com \
    --cc=avarab@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=j6t@kdbg.org \
    --cc=karsten.blees@gmail.com \
    --cc=l.s.r@web.de \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=ramsay@ramsayjones.plus.com \
    --cc=sunshine@sunshineco.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).