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

[PATCH v9 33/41] environment: add set_index_file()

From
Christian Couder <christian.couder@gmail.com>
Date
Jul 30, 2016, 17:25 UTC
Message-ID
<20160730172509.22939-34-chriscool@tuxfamily.org>
In-Reply-To
<20160730172509.22939-1-chriscool@tuxfamily.org>
Introduce set_index_file() to be able to temporarily change the index file.
It should be used like this:
    /* Save current index file */
    old_index_file = get_index_file();
    set_index_file((char *)tmp_index_file);
    /* Do stuff that will use tmp_index_file as the index file */
    ...
    /* When finished reset the index file */
    set_index_file(old_index_file);

It is intended to be used by builtins commands, in fact `git am`, to temporarily change the index file used by libified code.

This is useful when libified code uses the global index, but a builtin command wants another index file to be used instead.

And yeah this is a short cut and this new function should not be used by other code.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 cache.h       |  1 +
 environment.c | 12 ++++++++++++
 2 files changed, 13 insertions(+)
diff --git a/cache.h b/cache.h
index b5f76a4..18b96fe 100644
--- a/cache.h
+++ b/cache.h
@@ -461,6 +461,7 @@ extern int is_inside_work_tree(void);
 extern const char *get_git_dir(void);
 extern const char *get_git_common_dir(void);
 extern char *get_object_directory(void);
+extern void set_index_file(char *index_file);
 extern char *get_index_file(void);
 extern char *get_graft_file(void);
 extern int set_git_dir(const char *path);
diff --git a/environment.c b/environment.c
index ca72464..eb23d01 100644
--- a/environment.c
+++ b/environment.c
@@ -292,6 +292,18 @@ int odb_pack_keep(char *name, size_t namesz, const unsigned char *sha1)
 	return open(name, O_RDWR|O_CREAT|O_EXCL, 0600);
 }
 
+/*
+ * Temporarily change the index file.
+ * Please save the current index file using get_index_file() before changing
+ * the index file. And when finished, reset it to the saved value.
+ * Yeah, the libification of 'apply' took a short-circuit by adding this
+ * technical debt; please do not call this function in new codepaths.
+ */
+void set_index_file(char *index_file)
+{
+	git_index_file = index_file;
+}
+
 char *get_index_file(void)
 {
 	if (!git_index_file)

-- 
2.9.2.558.gf53e569
Previous: Christian CouderNext: Stefan Beller
Message 30 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.