git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v6 18/44] builtin/apply: make build_fake_ancestor() return -1 on error

From
Christian Couder <christian.couder@gmail.com>
Date
Jun 10, 2016, 20:10 UTC
Message-ID
<20160610201118.13813-19-chriscool@tuxfamily.org>
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
Previous: Christian CouderNext: Christian Couder
Message 13 of 50 in “libify apply and use lib in am, part 2”
  1. 00/44 libify apply and use lib in am, part 2Christian Couder, Jun 10, 2016
  2. 02/44 builtin/apply: make apply_patch() return -1 instead of die()ingChristian Couder, Jun 10, 2016
  3. 07/44 builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder, Jun 10, 2016
  4. 01/44 apply: move 'struct apply_state' to apply.hChristian Couder, Jun 10, 2016
  5. 06/44 builtin/apply: make parse_single_patch() return -1 on errorChristian Couder, Jun 10, 2016
  6. 10/44 apply: make init_apply_state() return -1 instead of exit()ingChristian Couder, Jun 10, 2016
  7. 04/44 builtin/apply: make find_header() return -1 instead of die()ingChristian Couder, Jun 10, 2016
  8. 16/44 builtin/apply: make gitdiff_*() return -1 on errorChristian Couder, Jun 10, 2016
  9. 15/44 builtin/apply: make gitdiff_*() return 1 at end of headerChristian Couder, Jun 10, 2016
  10. 23/44 builtin/apply: make write_out_one_result() return -1 on errorChristian Couder, Jun 10, 2016
  11. 17/44 builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Christian Couder, Jun 10, 2016
  12. 25/44 builtin/apply: make try_create_file() return -1 on errorChristian Couder, Jun 10, 2016
  13. 18/44 builtin/apply: make build_fake_ancestor() return -1 on errorChristian Couder, Jun 10, 2016
  14. 27/44 builtin/apply: rename option parsing functionsChristian Couder, Jun 10, 2016
  15. 28/44 apply: rename and move opt constants to apply.hChristian Couder, Jun 10, 2016
  16. 22/44 builtin/apply: make create_file() return -1 on errorChristian Couder, Jun 10, 2016
  17. 21/44 builtin/apply: make add_index_file() return -1 on errorChristian Couder, Jun 10, 2016
  18. 26/44 builtin/apply: make create_one_file() return -1 on errorChristian Couder, Jun 10, 2016
  19. 24/44 builtin/apply: make write_out_results() return -1 on errorChristian Couder, Jun 10, 2016
  20. 31/44 run-command: make dup_devnull() non staticChristian Couder, Jun 10, 2016
  21. Johannes SixtJun 11, 2016
  22. Christian CouderJun 11, 2016
  23. 35/44 apply: add 'be_silent' variable to 'struct apply_state'Christian Couder, Jun 10, 2016
  24. 36/44 apply: make 'be_silent' incompatible with 'apply_verbosely'Christian Couder, Jun 10, 2016
  25. 37/44 apply: don't print on stdout when be_silent is setChristian Couder, Jun 10, 2016
  26. 43/44 builtin/apply: add a cli option for be_silentChristian Couder, Jun 10, 2016
  27. René ScharfeJun 10, 2016
  28. Christian CouderJun 11, 2016
  29. 38/44 usage: add set_warn_routine()Christian Couder, Jun 10, 2016
  30. 44/44 apply: use error_errno() where possibleChristian Couder, Jun 10, 2016
  31. 39/44 usage: add get_error_routine() and get_warn_routine()Christian Couder, Jun 10, 2016
  32. 41/44 am: use be_silent in 'struct apply_state' to shut up applying patchesChristian Couder, Jun 10, 2016
  33. Junio C HamanoJun 10, 2016
  34. Christian CouderJun 11, 2016
  35. 42/44 run-command: make dup_devnull() static againChristian Couder, Jun 10, 2016
  36. 40/44 apply: change error_routine when be_silent is setChristian Couder, Jun 10, 2016
  37. 30/44 apply: make some parsing functions static againChristian Couder, Jun 10, 2016
  38. 34/44 write_or_die: use warning() instead of fprintf(stderr, ...)Christian Couder, Jun 10, 2016
  39. 33/44 builtin/am: use apply api in run_apply()Christian Couder, Jun 10, 2016
  40. 19/44 builtin/apply: make remove_file() return -1 on errorChristian Couder, Jun 10, 2016
  41. 32/44 environment: add set_index_file()Christian Couder, Jun 10, 2016
  42. 20/44 builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder, Jun 10, 2016
  43. 14/44 builtin/apply: make parse_traditional_patch() return -1 on errorChristian Couder, Jun 10, 2016
  44. 12/44 builtin/apply: move check_apply_state() to apply.cChristian Couder, Jun 10, 2016
  45. 09/44 builtin/apply: move init_apply_state() to apply.cChristian Couder, Jun 10, 2016
  46. 11/44 builtin/apply: make check_apply_state() return -1 instead of die()ingChristian Couder, Jun 10, 2016
  47. 13/44 builtin/apply: make apply_all_patches() return -1 on errorChristian Couder, Jun 10, 2016
  48. 03/44 builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder, Jun 10, 2016
  49. 08/44 builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ingChristian Couder, Jun 10, 2016
  50. 05/44 builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder, Jun 10, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.