From: Alban Gruin <alban.gruin@gmail.com> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Phillip Wood <phillip.wood123@gmail.com>, Alban Gruin <alban.gruin@gmail.com> Subject: [PATCH v4 05/12] merge-index: don't fork if the requested program is `git-merge-one-file' Date: Fri, 13 Nov 2020 12:04:21 +0100 [thread overview] Message-ID: <20201113110428.21265-6-alban.gruin@gmail.com> (raw) In-Reply-To: <20201113110428.21265-1-alban.gruin@gmail.com> Since `git-merge-one-file' has been rewritten and libified, this teaches `merge-index' to call merge_three_way() without forking using a new callback, merge_one_file_func(). Signed-off-by: Alban Gruin <alban.gruin@gmail.com> --- builtin/merge-index.c | 29 +++++++++++++++++++++++++++-- merge-strategies.c | 11 +++++++++++ merge-strategies.h | 6 ++++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/builtin/merge-index.c b/builtin/merge-index.c index 49e3382fb9..e684811d35 100644 --- a/builtin/merge-index.c +++ b/builtin/merge-index.c @@ -1,11 +1,15 @@ #define USE_THE_INDEX_COMPATIBILITY_MACROS #include "builtin.h" +#include "lockfile.h" #include "merge-strategies.h" int cmd_merge_index(int argc, const char **argv, const char *prefix) { int i, force_file = 0, err = 0, one_shot = 0, quiet = 0; const char *pgm; + void *data; + merge_fn merge_action; + struct lock_file lock = LOCK_INIT; /* Without this we cannot rely on waitpid() to tell * what happened to our children. @@ -26,7 +30,19 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix) quiet = 1; i++; } + pgm = argv[i++]; + if (!strcmp(pgm, "git-merge-one-file")) { + merge_action = merge_one_file_func; + data = (void *)the_repository; + + setup_work_tree(); + hold_locked_index(&lock, LOCK_DIE_ON_ERROR); + } else { + merge_action = merge_one_file_spawn; + data = (void *)pgm; + } + for (; i < argc; i++) { const char *arg = argv[i]; if (!force_file && *arg == '-') { @@ -36,13 +52,22 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix) } if (!strcmp(arg, "-a")) { err |= merge_all_index(&the_index, one_shot, quiet, - merge_one_file_spawn, (void *)pgm); + merge_action, data); continue; } die("git merge-index: unknown option %s", arg); } err |= merge_index_path(&the_index, one_shot, quiet, arg, - merge_one_file_spawn, (void *)pgm); + merge_action, data); + } + + if (merge_action == merge_one_file_func) { + if (err) { + rollback_lock_file(&lock); + return err; + } + + return write_locked_index(&the_index, &lock, COMMIT_LOCK); } return err; } diff --git a/merge-strategies.c b/merge-strategies.c index e1d121c993..aa31b7045c 100644 --- a/merge-strategies.c +++ b/merge-strategies.c @@ -173,6 +173,17 @@ int merge_three_way(struct repository *r, return 0; } +int merge_one_file_func(const struct object_id *orig_blob, + const struct object_id *our_blob, + const struct object_id *their_blob, const char *path, + unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode, + void *data) +{ + return merge_three_way((struct repository *)data, + orig_blob, our_blob, their_blob, path, + orig_mode, our_mode, their_mode); +} + int merge_one_file_spawn(const struct object_id *orig_blob, const struct object_id *our_blob, const struct object_id *their_blob, const char *path, diff --git a/merge-strategies.h b/merge-strategies.h index d2f52d6792..b69a12b390 100644 --- a/merge-strategies.h +++ b/merge-strategies.h @@ -15,6 +15,12 @@ typedef int (*merge_fn)(const struct object_id *orig_blob, unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode, void *data); +int merge_one_file_func(const struct object_id *orig_blob, + const struct object_id *our_blob, + const struct object_id *their_blob, const char *path, + unsigned int orig_mode, unsigned int our_mode, unsigned int their_mode, + void *data); + int merge_one_file_spawn(const struct object_id *orig_blob, const struct object_id *our_blob, const struct object_id *their_blob, const char *path, -- 2.20.1
next prev parent reply other threads:[~2020-11-13 12:11 UTC|newest] Thread overview: 156+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-25 12:19 [RFC PATCH v1 00/17] Rewrite the remaining merge strategies from shell to C Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 01/17] t6027: modernise tests Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 02/17] merge-one-file: rewrite in C Alban Gruin 2020-06-25 14:55 ` Chris Torek 2020-06-25 15:16 ` Phillip Wood 2020-06-25 18:17 ` Phillip Wood 2020-06-26 14:33 ` Phillip Wood 2020-07-12 11:22 ` Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 03/17] merge-one-file: remove calls to external processes Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 04/17] merge-one-file: use error() instead of fprintf(stderr, ...) Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 05/17] merge-one-file: libify merge_one_file() Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 06/17] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2020-06-26 10:13 ` Phillip Wood 2020-06-26 14:32 ` Phillip Wood 2020-07-12 11:36 ` Alban Gruin 2020-07-12 18:02 ` Phillip Wood 2020-07-12 20:10 ` Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 07/17] merge-resolve: rewrite in C Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 08/17] merge-resolve: remove calls to external processes Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 09/17] merge-resolve: libify merge_resolve() Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 10/17] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 11/17] merge-octopus: rewrite in C Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 12/17] merge-octopus: remove calls to external processes Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 13/17] merge-octopus: libify merge_octopus() Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 14/17] merge: use the "resolve" strategy without forking Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 15/17] merge: use the "octopus" " Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 16/17] sequencer: use the "resolve" " Alban Gruin 2020-06-25 16:11 ` Phillip Wood 2020-07-12 11:27 ` Alban Gruin 2020-06-25 12:19 ` [RFC PATCH v1 17/17] sequencer: use the "octopus" merge " Alban Gruin 2020-09-01 10:56 ` [PATCH v2 00/11] Rewrite the remaining merge strategies from shell to C Alban Gruin 2020-09-01 10:56 ` [PATCH v2 01/11] t6027: modernise tests Alban Gruin 2020-09-01 10:56 ` [PATCH v2 02/11] merge-one-file: rewrite in C Alban Gruin 2020-09-01 21:06 ` Junio C Hamano 2020-09-02 14:50 ` Alban Gruin 2020-09-01 10:56 ` [PATCH v2 03/11] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2020-09-01 21:11 ` Junio C Hamano 2020-09-02 15:37 ` Alban Gruin 2020-09-01 10:56 ` [PATCH v2 04/11] merge-index: don't fork if the requested program is `git-merge-one-file' Alban Gruin 2020-09-01 10:56 ` [PATCH v2 05/11] merge-resolve: rewrite in C Alban Gruin 2020-09-01 10:57 ` [PATCH v2 06/11] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2020-09-01 10:57 ` [PATCH v2 07/11] merge-octopus: rewrite in C Alban Gruin 2020-09-01 10:57 ` [PATCH v2 08/11] merge: use the "resolve" strategy without forking Alban Gruin 2020-09-01 10:57 ` [PATCH v2 09/11] merge: use the "octopus" " Alban Gruin 2020-09-01 10:57 ` [PATCH v2 10/11] sequencer: use the "resolve" " Alban Gruin 2020-09-01 10:57 ` [PATCH v2 11/11] sequencer: use the "octopus" merge " Alban Gruin 2020-10-05 12:26 ` [PATCH v3 00/11] Rewrite the remaining merge strategies from shell to C Alban Gruin 2020-10-05 12:26 ` [PATCH v3 01/11] t6027: modernise tests Alban Gruin 2020-10-06 20:50 ` Junio C Hamano 2020-10-05 12:26 ` [PATCH v3 02/11] merge-one-file: rewrite in C Alban Gruin 2020-10-06 22:01 ` Junio C Hamano 2020-10-21 19:47 ` Alban Gruin 2020-10-21 20:28 ` Junio C Hamano 2020-10-21 21:20 ` Junio C Hamano 2020-10-21 20:30 ` Junio C Hamano 2020-10-05 12:26 ` [PATCH v3 03/11] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2020-10-09 4:48 ` Junio C Hamano 2020-11-06 19:53 ` Alban Gruin 2020-10-05 12:26 ` [PATCH v3 04/11] merge-index: don't fork if the requested program is `git-merge-one-file' Alban Gruin 2020-10-16 19:07 ` Junio C Hamano 2020-10-05 12:26 ` [PATCH v3 05/11] merge-resolve: rewrite in C Alban Gruin 2020-10-16 19:19 ` Junio C Hamano 2020-11-06 19:53 ` Alban Gruin 2020-10-05 12:26 ` [PATCH v3 06/11] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2020-10-05 12:26 ` [PATCH v3 07/11] merge-octopus: rewrite in C Alban Gruin 2020-10-05 12:26 ` [PATCH v3 08/11] merge: use the "resolve" strategy without forking Alban Gruin 2020-10-05 12:26 ` [PATCH v3 09/11] merge: use the "octopus" " Alban Gruin 2020-10-05 12:26 ` [PATCH v3 10/11] sequencer: use the "resolve" " Alban Gruin 2020-10-05 12:26 ` [PATCH v3 11/11] sequencer: use the "octopus" merge " Alban Gruin 2020-10-07 6:57 ` [PATCH v3 00/11] Rewrite the remaining merge strategies from shell to C Johannes Schindelin 2020-11-13 11:04 ` [PATCH v4 00/12] " Alban Gruin 2020-11-13 11:04 ` [PATCH v4 01/12] t6027: modernise tests Alban Gruin 2020-11-13 11:04 ` [PATCH v4 02/12] update-index: move add_cacheinfo() to read-cache.c Alban Gruin 2020-11-13 11:04 ` [PATCH v4 03/12] merge-one-file: rewrite in C Alban Gruin 2020-11-13 11:04 ` [PATCH v4 04/12] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2020-11-13 11:04 ` Alban Gruin [this message] 2020-11-13 11:04 ` [PATCH v4 06/12] merge-resolve: rewrite in C Alban Gruin 2020-11-13 11:04 ` [PATCH v4 07/12] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2020-11-13 11:04 ` [PATCH v4 08/12] merge-octopus: rewrite in C Alban Gruin 2020-11-13 11:04 ` [PATCH v4 09/12] merge: use the "resolve" strategy without forking Alban Gruin 2020-11-13 11:04 ` [PATCH v4 10/12] merge: use the "octopus" " Alban Gruin 2020-11-13 11:04 ` [PATCH v4 11/12] sequencer: use the "resolve" " Alban Gruin 2020-11-13 11:04 ` [PATCH v4 12/12] sequencer: use the "octopus" merge " Alban Gruin 2020-11-16 10:21 ` [PATCH v5 00/12] Rewrite the remaining merge strategies from shell to C Alban Gruin 2020-11-16 10:21 ` [PATCH v5 01/12] t6027: modernise tests Alban Gruin 2020-11-16 10:21 ` [PATCH v5 02/12] update-index: move add_cacheinfo() to read-cache.c Alban Gruin 2020-11-16 10:21 ` [PATCH v5 03/12] merge-one-file: rewrite in C Alban Gruin 2020-11-16 10:21 ` [PATCH v5 04/12] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2020-11-16 10:21 ` [PATCH v5 05/12] merge-index: don't fork if the requested program is `git-merge-one-file' Alban Gruin 2020-11-16 10:21 ` [PATCH v5 06/12] merge-resolve: rewrite in C Alban Gruin 2020-11-16 10:21 ` [PATCH v5 07/12] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2020-11-16 10:21 ` [PATCH v5 08/12] merge-octopus: rewrite in C Alban Gruin 2020-11-16 10:21 ` [PATCH v5 09/12] merge: use the "resolve" strategy without forking Alban Gruin 2020-11-16 10:21 ` [PATCH v5 10/12] merge: use the "octopus" " Alban Gruin 2020-11-16 10:21 ` [PATCH v5 11/12] sequencer: use the "resolve" " Alban Gruin 2020-11-16 10:21 ` [PATCH v5 12/12] sequencer: use the "octopus" merge " Alban Gruin 2020-11-24 11:53 ` [PATCH v6 00/13] Rewrite the remaining merge strategies from shell to C Alban Gruin 2020-11-24 11:53 ` [PATCH v6 01/13] t6407: modernise tests Alban Gruin 2020-11-24 11:53 ` [PATCH v6 02/13] t6060: modify multiple files to expose a possible issue with merge-index Alban Gruin 2020-11-24 11:53 ` [PATCH v6 03/13] update-index: move add_cacheinfo() to read-cache.c Alban Gruin 2020-12-22 20:54 ` Junio C Hamano 2020-11-24 11:53 ` [PATCH v6 04/13] merge-one-file: rewrite in C Alban Gruin 2020-12-22 21:36 ` Junio C Hamano 2021-01-03 22:41 ` Alban Gruin 2021-01-08 6:54 ` Junio C Hamano 2020-11-24 11:53 ` [PATCH v6 05/13] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2021-01-05 15:59 ` Derrick Stolee 2021-01-05 23:20 ` Alban Gruin 2020-11-24 11:53 ` [PATCH v6 06/13] merge-index: don't fork if the requested program is `git-merge-one-file' Alban Gruin 2021-01-05 16:11 ` Derrick Stolee 2021-01-05 17:35 ` Martin Ågren 2021-01-05 23:20 ` Alban Gruin 2021-01-05 23:20 ` Alban Gruin 2021-01-06 2:04 ` Junio C Hamano 2021-01-10 17:15 ` Alban Gruin 2021-01-10 20:51 ` Junio C Hamano 2021-03-08 20:32 ` Alban Gruin 2020-11-24 11:53 ` [PATCH v6 07/13] merge-resolve: rewrite in C Alban Gruin 2020-11-24 11:53 ` [PATCH v6 08/13] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2021-01-05 16:19 ` Derrick Stolee 2020-11-24 11:53 ` [PATCH v6 09/13] merge-octopus: rewrite in C Alban Gruin 2021-01-05 16:40 ` Derrick Stolee 2020-11-24 11:53 ` [PATCH v6 10/13] merge: use the "resolve" strategy without forking Alban Gruin 2021-01-05 16:45 ` Derrick Stolee 2020-11-24 11:53 ` [PATCH v6 11/13] merge: use the "octopus" " Alban Gruin 2020-11-24 11:53 ` [PATCH v6 12/13] sequencer: use the "resolve" " Alban Gruin 2020-11-24 11:53 ` [PATCH v6 13/13] sequencer: use the "octopus" merge " Alban Gruin 2020-11-24 19:34 ` [PATCH v6 00/13] Rewrite the remaining merge strategies from shell to C SZEDER Gábor 2021-01-05 16:50 ` Derrick Stolee 2021-03-17 20:49 ` [PATCH v7 00/15] " Alban Gruin 2021-03-17 20:49 ` [PATCH v7 01/15] t6407: modernise tests Alban Gruin 2021-03-17 20:49 ` [PATCH v7 02/15] t6060: modify multiple files to expose a possible issue with merge-index Alban Gruin 2021-03-17 20:49 ` [PATCH v7 03/15] t6060: add tests for removed files Alban Gruin 2021-03-22 21:36 ` Johannes Schindelin 2021-03-23 20:43 ` Alban Gruin 2021-03-17 20:49 ` [PATCH v7 04/15] merge-index: libify merge_one_path() and merge_all() Alban Gruin 2021-03-17 20:49 ` [PATCH v7 05/15] merge-index: drop the index Alban Gruin 2021-03-17 20:49 ` [PATCH v7 06/15] merge-index: add a new way to invoke `git-merge-one-file' Alban Gruin 2021-03-17 20:49 ` [PATCH v7 07/15] update-index: move add_cacheinfo() to read-cache.c Alban Gruin 2021-03-22 21:59 ` Johannes Schindelin 2021-03-23 20:45 ` Alban Gruin 2021-03-17 20:49 ` [PATCH v7 08/15] merge-one-file: rewrite in C Alban Gruin 2021-03-22 22:20 ` Johannes Schindelin 2021-03-23 20:53 ` Alban Gruin 2021-03-24 9:10 ` Johannes Schindelin 2021-04-10 14:17 ` Alban Gruin 2021-03-17 20:49 ` [PATCH v7 09/15] merge-resolve: " Alban Gruin 2021-03-23 22:21 ` Johannes Schindelin 2021-04-10 14:17 ` Alban Gruin 2021-03-17 20:49 ` [PATCH v7 10/15] merge-recursive: move better_branch_name() to merge.c Alban Gruin 2021-03-17 20:49 ` [PATCH v7 11/15] merge-octopus: rewrite in C Alban Gruin 2021-03-23 23:58 ` Johannes Schindelin 2021-03-17 20:49 ` [PATCH v7 12/15] merge: use the "resolve" strategy without forking Alban Gruin 2021-03-17 20:49 ` [PATCH v7 13/15] merge: use the "octopus" " Alban Gruin 2021-03-17 20:49 ` [PATCH v7 14/15] sequencer: use the "resolve" " Alban Gruin 2021-03-17 20:49 ` [PATCH v7 15/15] sequencer: use the "octopus" merge " Alban Gruin
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=20201113110428.21265-6-alban.gruin@gmail.com \ --to=alban.gruin@gmail.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=phillip.wood123@gmail.com \ --subject='Re: [PATCH v4 05/12] merge-index: don'\''t fork if the requested program is `git-merge-one-file'\''' \ /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
Code repositories for project(s) associated with this 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).