From: Phillip Wood <phillip.wood123@gmail.com>
To: Alban Gruin <alban.gruin@gmail.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: [RFC PATCH v1 06/17] merge-index: libify merge_one_path() and merge_all()
Date: Fri, 26 Jun 2020 11:13:21 +0100 [thread overview]
Message-ID: <0e20fa12-4628-d1fe-fc6e-df83d26edda3@gmail.com> (raw)
In-Reply-To: <20200625121953.16991-7-alban.gruin@gmail.com>
Hi Alban
On 25/06/2020 13:19, Alban Gruin wrote:
> The "resolve" and "octopus" merge strategies do not call directly `git
> merge-one-file', they delegate the work to another git command, `git
> merge-index', that will loop over files in the index and call the
> specified command. Unfortunately, these functions are not part of
> libgit.a, which means that once rewritten, the strategies would still
> have to invoke `merge-one-file' by spawning a new process first.
>
> To avoid this, this moves merge_one_path(), merge_all(), and their
> helpers to merge-strategies.c. They also take a callback to dictate
> what they should do for each file. For now, only one launching a new
> process is defined to preserve the behaviour of the builtin version.
>
> Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
> ---
>
> Notes:
> This patch is best viewed with `--color-moved'.
>
> builtin/merge-index.c | 77 +++------------------------------
> merge-strategies.c | 99 +++++++++++++++++++++++++++++++++++++++++++
> merge-strategies.h | 17 ++++++++
> 3 files changed, 123 insertions(+), 70 deletions(-)
>
> diff --git a/builtin/merge-index.c b/builtin/merge-index.c
> index 38ea6ad6ca..6cb666cc78 100644
> --- a/builtin/merge-index.c
> +++ b/builtin/merge-index.c
> @@ -1,74 +1,11 @@
> #define USE_THE_INDEX_COMPATIBILITY_MACROS
> #include "builtin.h"
> -#include "run-command.h"
> -
> -static const char *pgm;
> -static int one_shot, quiet;
> -static int err;
> -
> -static int merge_entry(int pos, const char *path)
> -{
> - int found;
> - const char *arguments[] = { pgm, "", "", "", path, "", "", "", NULL };
> - char hexbuf[4][GIT_MAX_HEXSZ + 1];
> - char ownbuf[4][60];
> -
> - if (pos >= active_nr)
> - die("git merge-index: %s not in the cache", path);
> - found = 0;
> - do {
> - const struct cache_entry *ce = active_cache[pos];
> - int stage = ce_stage(ce);
> -
> - if (strcmp(ce->name, path))
> - break;
> - found++;
> - oid_to_hex_r(hexbuf[stage], &ce->oid);
> - xsnprintf(ownbuf[stage], sizeof(ownbuf[stage]), "%o", ce->ce_mode);
> - arguments[stage] = hexbuf[stage];
> - arguments[stage + 4] = ownbuf[stage];
> - } while (++pos < active_nr);
> - if (!found)
> - die("git merge-index: %s not in the cache", path);
> -
> - if (run_command_v_opt(arguments, 0)) {
> - if (one_shot)
> - err++;
> - else {
> - if (!quiet)
> - die("merge program failed");
> - exit(1);
> - }
> - }
> - return found;
> -}
> -
> -static void merge_one_path(const char *path)
> -{
> - int pos = cache_name_pos(path, strlen(path));
> -
> - /*
> - * If it already exists in the cache as stage0, it's
> - * already merged and there is nothing to do.
> - */
> - if (pos < 0)
> - merge_entry(-pos-1, path);
> -}
> -
> -static void merge_all(void)
> -{
> - int i;
> - for (i = 0; i < active_nr; i++) {
> - const struct cache_entry *ce = active_cache[i];
> - if (!ce_stage(ce))
> - continue;
> - i += merge_entry(i, ce->name)-1;
> - }
> -}
> +#include "merge-strategies.h"
>
> int cmd_merge_index(int argc, const char **argv, const char *prefix)
> {
> - int i, force_file = 0;
> + int i, force_file = 0, err = 0, one_shot = 0, quiet = 0;
> + const char *pgm;
>
> /* Without this we cannot rely on waitpid() to tell
> * what happened to our children.
> @@ -98,14 +35,14 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix)
> continue;
> }
> if (!strcmp(arg, "-a")) {
> - merge_all();
> + err |= merge_all(&the_index, one_shot, quiet,
> + merge_program_cb, (void *)pgm);
> continue;
> }
> die("git merge-index: unknown option %s", arg);
> }
> - merge_one_path(arg);
> + err |= merge_one_path(&the_index, one_shot, quiet, arg,
> + merge_program_cb, (void *)pgm);
> }
> - if (err && !quiet)
> - die("merge program failed");
> return err;
> }
> diff --git a/merge-strategies.c b/merge-strategies.c
> index 3a9fce9f22..f4c0b4acd6 100644
> --- a/merge-strategies.c
> +++ b/merge-strategies.c
> @@ -1,6 +1,7 @@
> #include "cache.h"
> #include "dir.h"
> #include "merge-strategies.h"
> +#include "run-command.h"
> #include "xdiff-interface.h"
>
> static int add_to_index_cacheinfo(struct index_state *istate,
> @@ -189,3 +190,101 @@ int merge_strategies_one_file(struct repository *r,
>
> return 0;
> }
> +
> +int merge_program_cb(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)
Using void* is slightly unfortunate but it's needed later.
It would be nice to check if the program to run is git-merge-one-file
and call the appropriate function instead in that case so all users of
merge-index get the benefit of it being builtin. That probably wants to
be done in cmd_merge_index() rather than here though.
> +{
> + char ownbuf[3][60] = {{0}};
I know this is copied from above but it would be better to use
GIT_MAX_HEXSZ rather than 60
> + const char *arguments[] = { (char *)data, "", "", "", path,
> + ownbuf[0], ownbuf[1], ownbuf[2],
> + NULL };
> +
> + if (orig_blob)
> + arguments[1] = oid_to_hex(orig_blob);
> + if (our_blob)
> + arguments[2] = oid_to_hex(our_blob);
> + if (their_blob)
> + arguments[3] = oid_to_hex(their_blob);
> +
> + xsnprintf(ownbuf[0], sizeof(ownbuf[0]), "%o", orig_mode);
> + xsnprintf(ownbuf[1], sizeof(ownbuf[1]), "%o", our_mode);
> + xsnprintf(ownbuf[2], sizeof(ownbuf[2]), "%o", their_mode);
These are leaked. Also are you sure we want to fill out the mode if the
corresponding blob is missing - I guess it doesn't matter but it would
be good to check that - i think the original passed "". It also passed
"" rather than "0000..." for the blobs that were missing I think.
Best Wishes
Phillip
> +
> + return run_command_v_opt(arguments, 0);
> +}
> +
> +static int merge_entry(struct index_state *istate, int quiet, int pos,
> + const char *path, merge_cb cb, void *data)
> +{
> + int found = 0;
> + const struct object_id *oids[3] = {NULL};
> + unsigned int modes[3] = {0};
> +
> + do {
> + const struct cache_entry *ce = istate->cache[pos];
> + int stage = ce_stage(ce);
> +
> + if (strcmp(ce->name, path))
> + break;
> + found++;
> + oids[stage - 1] = &ce->oid;
> + modes[stage - 1] = ce->ce_mode;
> + } while (++pos < istate->cache_nr);
> + if (!found)
> + return error(_("%s is not in the cache"), path);
> +
> + if (cb(oids[0], oids[1], oids[2], path, modes[0], modes[1], modes[2], data)) {
> + if (!quiet)
> + error(_("Merge program failed"));
> + return -2;
> + }
> +
> + return found;
> +}
> +
> +int merge_one_path(struct index_state *istate, int oneshot, int quiet,
> + const char *path, merge_cb cb, void *data)
> +{
> + int pos = index_name_pos(istate, path, strlen(path)), ret;
> +
> + /*
> + * If it already exists in the cache as stage0, it's
> + * already merged and there is nothing to do.
> + */
> + if (pos < 0) {
> + ret = merge_entry(istate, quiet, -pos - 1, path, cb, data);
> + if (ret == -1)
> + return -1;
> + else if (ret == -2)
> + return 1;
> + }
> + return 0;
> +}
> +
> +int merge_all(struct index_state *istate, int oneshot, int quiet,
> + merge_cb cb, void *data)
> +{
> + int err = 0, i, ret;
> + for (i = 0; i < istate->cache_nr; i++) {
> + const struct cache_entry *ce = istate->cache[i];
> + if (!ce_stage(ce))
> + continue;
> +
> + ret = merge_entry(istate, quiet, i, ce->name, cb, data);
> + if (ret > 0)
> + i += ret - 1;
> + else if (ret == -1)
> + return -1;
> + else if (ret == -2) {
> + if (oneshot)
> + err++;
> + else
> + return 1;
> + }
> + }
> +
> + return err;
> +}
> diff --git a/merge-strategies.h b/merge-strategies.h
> index b527d145c7..cf78d7eaf4 100644
> --- a/merge-strategies.h
> +++ b/merge-strategies.h
> @@ -10,4 +10,21 @@ int merge_strategies_one_file(struct repository *r,
> unsigned int orig_mode, unsigned int our_mode,
> unsigned int their_mode);
>
> +typedef int (*merge_cb)(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_program_cb(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_path(struct index_state *istate, int oneshot, int quiet,
> + const char *path, merge_cb cb, void *data);
> +int merge_all(struct index_state *istate, int oneshot, int quiet,
> + merge_cb cb, void *data);
> +
> #endif /* MERGE_STRATEGIES_H */
>
next prev parent reply other threads:[~2020-06-26 10:14 UTC|newest]
Thread overview: 221+ 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 [this message]
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 ` [PATCH v4 05/12] merge-index: don't fork if the requested program is `git-merge-one-file' Alban Gruin
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
2022-08-09 18:54 ` [PATCH v8 00/14] Rewrite the remaining merge strategies from shell to C Alban Gruin
2022-08-09 18:54 ` [PATCH v8 01/14] t6060: modify multiple files to expose a possible issue with merge-index Alban Gruin
2022-08-09 18:54 ` [PATCH v8 02/14] t6060: add tests for removed files Alban Gruin
2022-08-09 18:54 ` [PATCH v8 03/14] merge-index: libify merge_one_path() and merge_all() Alban Gruin
2022-08-17 2:10 ` Ævar Arnfjörð Bjarmason
2022-08-09 18:54 ` [PATCH v8 04/14] merge-index: drop the index Alban Gruin
2022-08-09 18:54 ` [PATCH v8 05/14] merge-index: add a new way to invoke `git-merge-one-file' Alban Gruin
2022-08-09 21:36 ` Johannes Schindelin
2022-08-10 13:14 ` Phillip Wood
2022-08-09 18:54 ` [PATCH v8 06/14] update-index: move add_cacheinfo() to read-cache.c Alban Gruin
2022-08-09 18:54 ` [PATCH v8 07/14] merge-one-file: rewrite in C Alban Gruin
2022-08-09 22:01 ` Johannes Schindelin
2022-08-09 18:54 ` [PATCH v8 08/14] merge-resolve: " Alban Gruin
2022-08-10 15:03 ` Phillip Wood
2022-08-10 21:20 ` Junio C Hamano
2022-08-16 12:09 ` Johannes Schindelin
2022-08-16 19:36 ` Junio C Hamano
2022-08-17 9:42 ` Johannes Schindelin
2022-08-17 19:06 ` Elijah Newren
2022-08-17 19:18 ` Junio C Hamano
2022-08-18 14:24 ` Ævar Arnfjörð Bjarmason
2022-08-18 17:32 ` Junio C Hamano
2022-08-19 1:43 ` Elijah Newren
2022-08-19 2:45 ` Ævar Arnfjörð Bjarmason
2022-08-19 4:27 ` Elijah Newren
2022-08-17 19:12 ` Junio C Hamano
2022-08-16 12:17 ` Johannes Schindelin
2022-08-16 14:02 ` Phillip Wood
2022-08-17 2:16 ` Ævar Arnfjörð Bjarmason
2022-08-18 14:43 ` Ævar Arnfjörð Bjarmason
2022-08-09 18:54 ` [PATCH v8 09/14] merge-recursive: move better_branch_name() to merge.c Alban Gruin
2022-08-09 18:54 ` [PATCH v8 10/14] merge-octopus: rewrite in C Alban Gruin
2022-08-09 18:54 ` [PATCH v8 11/14] merge: use the "resolve" strategy without forking Alban Gruin
2022-08-13 16:18 ` Junio C Hamano
2022-08-09 18:54 ` [PATCH v8 12/14] merge: use the "octopus" " Alban Gruin
2022-08-09 18:54 ` [PATCH v8 13/14] sequencer: use the "resolve" " Alban Gruin
2022-08-09 18:54 ` [PATCH v8 14/14] sequencer: use the "octopus" " Alban Gruin
2022-11-18 11:18 ` [PATCH v9 00/12] merge-index: prepare to rewrite merge drivers in C Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 01/12] merge-index doc & -h: fix padding, labels and "()" use Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 02/12] t6060: modify multiple files to expose a possible issue with merge-index Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 03/12] t6060: add tests for removed files Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 04/12] merge-index tests: add usage tests Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 05/12] merge-index: migrate to parse_options() API Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 06/12] merge-index: improve die() error messages Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 07/12] merge-index i18n: mark die() messages for translation Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 08/12] merge-index: stop calling ensure_full_index() twice Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 09/12] builtin/merge-index.c: don't USE_THE_INDEX_COMPATIBILITY_MACROS Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 10/12] merge-index: libify merge_one_path() and merge_all() Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 11/12] merge-index: use "struct strvec" and helper to prepare args Ævar Arnfjörð Bjarmason
2022-11-18 11:18 ` [PATCH v9 12/12] merge-index: make the argument parsing sensible & simpler Ævar Arnfjörð Bjarmason
2022-11-18 23:30 ` [PATCH v9 00/12] merge-index: prepare to rewrite merge drivers in C Taylor Blau
2022-11-19 12:46 ` Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 " Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 01/12] merge-index doc & -h: fix padding, labels and "()" use Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 02/12] t6060: modify multiple files to expose a possible issue with merge-index Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 03/12] t6060: add tests for removed files Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 04/12] merge-index tests: add usage tests Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 05/12] merge-index: migrate to parse_options() API Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 06/12] merge-index: improve die() error messages Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 07/12] merge-index i18n: mark die() messages for translation Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 08/12] merge-index: stop calling ensure_full_index() twice Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 09/12] builtin/merge-index.c: don't USE_THE_INDEX_VARIABLE Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 10/12] merge-index: libify merge_one_path() and merge_all() Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 11/12] merge-index: use "struct strvec" and helper to prepare args Ævar Arnfjörð Bjarmason
2022-12-15 8:52 ` [PATCH v10 12/12] merge-index: make the argument parsing sensible & simpler Ævar Arnfjörð Bjarmason
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=0e20fa12-4628-d1fe-fc6e-df83d26edda3@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=alban.gruin@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).