From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org, Christian Couder <christian.couder@gmail.com>
Cc: "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>,
"Stefan Beller" <sbeller@google.com>,
"Matthieu Moy" <Matthieu.Moy@grenoble-inp.fr>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v6 18/44] builtin/apply: make build_fake_ancestor() return -1 on error
Date: Fri, 10 Jun 2016 22:10:52 +0200 [thread overview]
Message-ID: <20160610201118.13813-19-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20160610201118.13813-1-chriscool@tuxfamily.org>
To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.
To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", build_fake_ancestor() should return -1 instead
of calling die().
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
builtin/apply.c | 41 ++++++++++++++++++++++++++---------------
1 file changed, 26 insertions(+), 15 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 429fddd..e74b068 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3889,11 +3889,12 @@ static int preimage_sha1_in_gitlink_patch(struct patch *p, unsigned char sha1[20
}
/* Build an index that contains the just the files needed for a 3way merge */
-static void build_fake_ancestor(struct patch *list, const char *filename)
+static int build_fake_ancestor(struct patch *list, const char *filename)
{
struct patch *patch;
struct index_state result = { NULL };
static struct lock_file lock;
+ int res;
/* Once we start supporting the reverse patch, it may be
* worth showing the new sha1 prefix, but until then...
@@ -3911,31 +3912,38 @@ static void build_fake_ancestor(struct patch *list, const char *filename)
if (!preimage_sha1_in_gitlink_patch(patch, sha1))
; /* ok, the textual part looks sane */
else
- die("sha1 information is lacking or useless for submodule %s",
- name);
+ return error("sha1 information is lacking or "
+ "useless for submodule %s", name);
} else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) {
; /* ok */
} else if (!patch->lines_added && !patch->lines_deleted) {
/* mode-only change: update the current */
if (get_current_sha1(patch->old_name, sha1))
- die("mode change for %s, which is not "
- "in current HEAD", name);
+ return error("mode change for %s, which is not "
+ "in current HEAD", name);
} else
- die("sha1 information is lacking or useless "
- "(%s).", name);
+ return error("sha1 information is lacking or useless "
+ "(%s).", name);
ce = make_cache_entry(patch->old_mode, sha1, name, 0, 0);
if (!ce)
- die(_("make_cache_entry failed for path '%s'"), name);
- if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD))
- die ("Could not add %s to temporary index", name);
+ return error(_("make_cache_entry failed for path '%s'"),
+ name);
+ if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) {
+ free(ce);
+ return error("Could not add %s to temporary index",
+ name);
+ }
}
hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);
- if (write_locked_index(&result, &lock, COMMIT_LOCK))
- die ("Could not write temporary index to %s", filename);
-
+ res = write_locked_index(&result, &lock, COMMIT_LOCK);
discard_index(&result);
+
+ if (res)
+ return error("Could not write temporary index to %s", filename);
+
+ return 0;
}
static void stat_patch_list(struct apply_state *state, struct patch *patch)
@@ -4476,8 +4484,11 @@ static int apply_patch(struct apply_state *state,
goto end;
}
- if (state->fake_ancestor)
- build_fake_ancestor(list, state->fake_ancestor);
+ if (state->fake_ancestor &&
+ build_fake_ancestor(list, state->fake_ancestor)) {
+ res = -1;
+ goto end;
+ }
if (state->diffstat)
stat_patch_list(state, list);
--
2.9.0.rc2.362.g3cd93d0
next prev parent reply other threads:[~2016-06-10 20:12 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-10 20:10 [PATCH v6 00/44] libify apply and use lib in am, part 2 Christian Couder
2016-06-10 20:10 ` [PATCH v6 01/44] apply: move 'struct apply_state' to apply.h Christian Couder
2016-06-10 20:10 ` [PATCH v6 02/44] builtin/apply: make apply_patch() return -1 instead of die()ing Christian Couder
2016-06-10 20:10 ` [PATCH v6 03/44] builtin/apply: read_patch_file() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 04/44] builtin/apply: make find_header() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 05/44] builtin/apply: make parse_chunk() return a negative integer on error Christian Couder
2016-06-10 20:10 ` [PATCH v6 06/44] builtin/apply: make parse_single_patch() return -1 " Christian Couder
2016-06-10 20:10 ` [PATCH v6 07/44] builtin/apply: make parse_whitespace_option() return -1 instead of die()ing Christian Couder
2016-06-10 20:10 ` [PATCH v6 08/44] builtin/apply: make parse_ignorewhitespace_option() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 09/44] builtin/apply: move init_apply_state() to apply.c Christian Couder
2016-06-10 20:10 ` [PATCH v6 10/44] apply: make init_apply_state() return -1 instead of exit()ing Christian Couder
2016-06-10 20:10 ` [PATCH v6 11/44] builtin/apply: make check_apply_state() return -1 instead of die()ing Christian Couder
2016-06-10 20:10 ` [PATCH v6 12/44] builtin/apply: move check_apply_state() to apply.c Christian Couder
2016-06-10 20:10 ` [PATCH v6 13/44] builtin/apply: make apply_all_patches() return -1 on error Christian Couder
2016-06-10 20:10 ` [PATCH v6 14/44] builtin/apply: make parse_traditional_patch() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 15/44] builtin/apply: make gitdiff_*() return 1 at end of header Christian Couder
2016-06-10 20:10 ` [PATCH v6 16/44] builtin/apply: make gitdiff_*() return -1 on error Christian Couder
2016-06-10 20:10 ` [PATCH v6 17/44] builtin/apply: change die_on_unsafe_path() to check_unsafe_path() Christian Couder
2016-06-10 20:10 ` Christian Couder [this message]
2016-06-10 20:10 ` [PATCH v6 19/44] builtin/apply: make remove_file() return -1 on error Christian Couder
2016-06-10 20:10 ` [PATCH v6 20/44] builtin/apply: make add_conflicted_stages_file() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 21/44] builtin/apply: make add_index_file() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 22/44] builtin/apply: make create_file() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 23/44] builtin/apply: make write_out_one_result() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 24/44] builtin/apply: make write_out_results() " Christian Couder
2016-06-10 20:10 ` [PATCH v6 25/44] builtin/apply: make try_create_file() " Christian Couder
2016-06-10 20:11 ` [PATCH v6 26/44] builtin/apply: make create_one_file() " Christian Couder
2016-06-10 20:11 ` [PATCH v6 27/44] builtin/apply: rename option parsing functions Christian Couder
2016-06-10 20:11 ` [PATCH v6 28/44] apply: rename and move opt constants to apply.h Christian Couder
2016-06-10 20:11 ` [PATCH v6 30/44] apply: make some parsing functions static again Christian Couder
2016-06-10 20:11 ` [PATCH v6 31/44] run-command: make dup_devnull() non static Christian Couder
2016-06-11 8:17 ` Johannes Sixt
2016-06-11 10:18 ` Christian Couder
2016-06-10 20:11 ` [PATCH v6 32/44] environment: add set_index_file() Christian Couder
2016-06-10 20:11 ` [PATCH v6 33/44] builtin/am: use apply api in run_apply() Christian Couder
2016-06-10 20:11 ` [PATCH v6 34/44] write_or_die: use warning() instead of fprintf(stderr, ...) Christian Couder
2016-06-10 20:11 ` [PATCH v6 35/44] apply: add 'be_silent' variable to 'struct apply_state' Christian Couder
2016-06-10 20:11 ` [PATCH v6 36/44] apply: make 'be_silent' incompatible with 'apply_verbosely' Christian Couder
2016-06-10 20:11 ` [PATCH v6 37/44] apply: don't print on stdout when be_silent is set Christian Couder
2016-06-10 20:11 ` [PATCH v6 38/44] usage: add set_warn_routine() Christian Couder
2016-06-10 20:11 ` [PATCH v6 39/44] usage: add get_error_routine() and get_warn_routine() Christian Couder
2016-06-10 20:11 ` [PATCH v6 40/44] apply: change error_routine when be_silent is set Christian Couder
2016-06-10 20:11 ` [PATCH v6 41/44] am: use be_silent in 'struct apply_state' to shut up applying patches Christian Couder
2016-06-10 22:07 ` Junio C Hamano
2016-06-11 10:07 ` Christian Couder
2016-06-10 20:11 ` [PATCH v6 42/44] run-command: make dup_devnull() static again Christian Couder
2016-06-10 20:11 ` [PATCH v6 43/44] builtin/apply: add a cli option for be_silent Christian Couder
2016-06-10 20:59 ` René Scharfe
2016-06-11 10:16 ` Christian Couder
2016-06-10 20:11 ` [PATCH v6 44/44] apply: use error_errno() where possible Christian Couder
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160610201118.13813-19-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karsten.blees@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=sbeller@google.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).