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

[PATCH v9 21/41] builtin/apply: make add_conflicted_stages_file() return -1 on error

From
Christian Couder <christian.couder@gmail.com>
Date
Jul 30, 2016, 17:24 UTC
Message-ID
<20160730172509.22939-22-chriscool@tuxfamily.org>
In-Reply-To
<20160730172509.22939-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", add_conflicted_stages_file() 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 | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 6ffd4c0..1f405b4 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4224,7 +4224,7 @@ static void create_one_file(struct apply_state *state,
 	die_errno(_("unable to write file '%s' mode %o"), path, mode);
 }
 
-static void add_conflicted_stages_file(struct apply_state *state,
+static int add_conflicted_stages_file(struct apply_state *state,
 				       struct patch *patch)
 {
 	int stage, namelen;
@@ -4232,7 +4232,7 @@ static void add_conflicted_stages_file(struct apply_state *state,
 	struct cache_entry *ce;
 
 	if (!state->update_index)
-		return;
+		return 0;
 	namelen = strlen(patch->new_name);
 	ce_size = cache_entry_size(namelen);
 	mode = patch->new_mode ? patch->new_mode : (S_IFREG | 0644);
@@ -4247,9 +4247,14 @@ static void add_conflicted_stages_file(struct apply_state *state,
 		ce->ce_flags = create_ce_flags(stage);
 		ce->ce_namelen = namelen;
 		hashcpy(ce->sha1, patch->threeway_stage[stage - 1].hash);
-		if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0)
-			die(_("unable to add cache entry for %s"), patch->new_name);
+		if (add_cache_entry(ce, ADD_CACHE_OK_TO_ADD) < 0) {
+			free(ce);
+			return error(_("unable to add cache entry for %s"),
+				     patch->new_name);
+		}
 	}
+
+	return 0;
 }
 
 static void create_file(struct apply_state *state, struct patch *patch)
@@ -4263,9 +4268,10 @@ static void create_file(struct apply_state *state, struct patch *patch)
 		mode = S_IFREG | 0644;
 	create_one_file(state, path, mode, buf, size);
 
-	if (patch->conflicted_threeway)
-		add_conflicted_stages_file(state, patch);
-	else
+	if (patch->conflicted_threeway) {
+		if (add_conflicted_stages_file(state, patch))
+			exit(128);
+	} else
 		add_index_file(state, path, mode, buf, size);
 }
 

-- 
2.9.2.558.gf53e569
Previous: Christian CouderNext: Christian Couder
Message 17 of 53 in “libify apply and use lib in am, part 2”
  1. 00/41 libify apply and use lib in am, part 2Christian Couder, Jul 30, 2016
  2. 01/41 apply: make some names more specificChristian Couder, Jul 30, 2016
  3. 02/41 apply: move 'struct apply_state' to apply.hChristian Couder, Jul 30, 2016
  4. 03/41 builtin/apply: make apply_patch() return -1 or -128 instead of die()ingChristian Couder, Jul 30, 2016
  5. Stefan BellerAug 1, 2016
  6. 04/41 builtin/apply: read_patch_file() return -1 instead of die()ingChristian Couder, Jul 30, 2016
  7. Stefan BellerAug 1, 2016
  8. 05/41 builtin/apply: make find_header() return -128 instead of die()ingChristian Couder, Jul 30, 2016
  9. 06/41 builtin/apply: make parse_chunk() return a negative integer on errorChristian Couder, Jul 30, 2016
  10. 07/41 builtin/apply: make parse_single_patch() return -1 on errorChristian Couder, Jul 30, 2016
  11. 20/41 builtin/apply: make remove_file() return -1 on errorChristian Couder, Jul 30, 2016
  12. 16/41 builtin/apply: make gitdiff_*() return 1 at end of headerChristian Couder, Jul 30, 2016
  13. 18/41 builtin/apply: change die_on_unsafe_path() to check_unsafe_path()Christian Couder, Jul 30, 2016
  14. 23/41 builtin/apply: make create_file() return -1 on errorChristian Couder, Jul 30, 2016
  15. 25/41 builtin/apply: make write_out_results() return -1 on errorChristian Couder, Jul 30, 2016
  16. 27/41 builtin/apply: make create_one_file() return -1 on errorChristian Couder, Jul 30, 2016
  17. 21/41 builtin/apply: make add_conflicted_stages_file() return -1 on errorChristian Couder, Jul 30, 2016
  18. 24/41 builtin/apply: make write_out_one_result() return -1 on errorChristian Couder, Jul 30, 2016
  19. 29/41 apply: rename and move opt constants to apply.hChristian Couder, Jul 30, 2016
  20. 36/41 apply: don't print on stdout in verbosity_silent modeChristian Couder, Jul 30, 2016
  21. 31/41 apply: make some parsing functions static againChristian Couder, Jul 30, 2016
  22. 22/41 builtin/apply: make add_index_file() return -1 on errorChristian Couder, Jul 30, 2016
  23. 37/41 usage: add set_warn_routine()Christian Couder, Jul 30, 2016
  24. 19/41 builtin/apply: make build_fake_ancestor() return -1 on errorChristian Couder, Jul 30, 2016
  25. 26/41 builtin/apply: make try_create_file() return -1 on errorChristian Couder, Jul 30, 2016
  26. 39/41 apply: change error_routine when silentChristian Couder, Jul 30, 2016
  27. Stefan BellerAug 1, 2016
  28. Christian CouderAug 8, 2016
  29. 17/41 builtin/apply: make gitdiff_*() return -1 on errorChristian Couder, Jul 30, 2016
  30. 33/41 environment: add set_index_file()Christian Couder, Jul 30, 2016
  31. Stefan BellerAug 1, 2016
  32. Junio C HamanoAug 1, 2016
  33. Junio C HamanoAug 1, 2016
  34. Christian CouderAug 3, 2016
  35. Christian CouderAug 3, 2016
  36. 28/41 builtin/apply: rename option parsing functionsChristian Couder, Jul 30, 2016
  37. 34/41 write_or_die: use warning() instead of fprintf(stderr, ...)Christian Couder, Jul 30, 2016
  38. 38/41 usage: add get_error_routine() and get_warn_routine()Christian Couder, Jul 30, 2016
  39. 35/41 apply: make it possible to silently applyChristian Couder, Jul 30, 2016
  40. Junio C HamanoAug 1, 2016
  41. 41/41 builtin/am: use apply api in run_apply()Christian Couder, Jul 30, 2016
  42. 32/41 apply: use error_errno() where possibleChristian Couder, Jul 30, 2016
  43. 40/41 apply: refactor `git apply` option parsingChristian Couder, Jul 30, 2016
  44. 15/41 builtin/apply: make parse_traditional_patch() return -1 on errorChristian Couder, Jul 30, 2016
  45. 14/41 builtin/apply: make apply_all_patches() return 128 or 1 on errorChristian Couder, Jul 30, 2016
  46. 10/41 builtin/apply: move init_apply_state() to apply.cChristian Couder, Jul 30, 2016
  47. 12/41 builtin/apply: make check_apply_state() return -1 instead of die()ingChristian Couder, Jul 30, 2016
  48. 13/41 builtin/apply: move check_apply_state() to apply.cChristian Couder, Jul 30, 2016
  49. 11/41 apply: make init_apply_state() return -1 instead of exit()ingChristian Couder, Jul 30, 2016
  50. 08/41 builtin/apply: make parse_whitespace_option() return -1 instead of die()ingChristian Couder, Jul 30, 2016
  51. 09/41 builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ingChristian Couder, Jul 30, 2016
  52. Christian CouderJul 30, 2016
  53. Junio C HamanoAug 1, 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.