diff options
| author | Antonin Delpeuch <antonin@delpeuch.eu> | 2024-07-13 16:51:46 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-13 18:10:49 -0700 |
| commit | 9c93ba4d0aee1bc8c663a13552afd2b2c22863a9 (patch) | |
| tree | fbbc5fb0bcfd9fdecf3a5eee51fa76bea18225a5 /t/t7615/ours.c | |
| parent | 557ae147e6cdc9db121269b058c757ac5092f9c9 (diff) | |
| download | git-9c93ba4d0aee1bc8c663a13552afd2b2c22863a9.tar.gz | |
merge-recursive: honor diff.algorithm
The documentation claims that "recursive defaults to the diff.algorithm
config setting", but this is currently not the case. This fixes it,
ensuring that diff.algorithm is used when -Xdiff-algorithm is not
supplied. This affects the following porcelain commands: "merge",
"rebase", "cherry-pick", "pull", "stash", "log", "am" and "checkout".
It also affects the "merge-tree" ancillary interrogator.
This change refactors the initialization of merge options to introduce
two functions, "init_merge_ui_options" and "init_merge_basic_options"
instead of just one "init_merge_options". This design follows the
approach used in diff.c, providing initialization methods for
porcelain and plumbing commands respectively. Thanks to that, the
"replay" and "merge-recursive" plumbing commands remain unaffected by
diff.algorithm.
Signed-off-by: Antonin Delpeuch <antonin@delpeuch.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7615/ours.c')
| -rw-r--r-- | t/t7615/ours.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t7615/ours.c b/t/t7615/ours.c new file mode 100644 index 0000000000..44d8251397 --- /dev/null +++ b/t/t7615/ours.c @@ -0,0 +1,17 @@ +int g(size_t u) +{ + while (u < 30) + { + u++; + } + return u; +} + +int h(int x, int y, int z) +{ + if (z == 0) + { + return x; + } + return y; +} |