From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Christian Couder <chriscool@tuxfamily.org>,
Taylor Blau <me@ttaylorr.com>, Elijah Newren <newren@gmail.com>,
Elijah Newren <newren@gmail.com>
Subject: [PATCH 7/8] merge-tree: support saving merge messages to a separate file
Date: Fri, 31 Dec 2021 05:04:03 +0000 [thread overview]
Message-ID: <777de92d9f166793cddbb383f497518a5dedb9f4.1640927044.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1114.git.git.1640927044.gitgitgadget@gmail.com>
From: Elijah Newren <newren@gmail.com>
When running `git merge-tree --real`, we previously would only return an
exit status reflecting the cleanness of a merge, and print out the
toplevel tree of the resulting merge. Merges also have informational
messages, ("Auto-merging <PATH>", "CONFLICT (content): ...", "CONFLICT
(file/directory)", etc.) In fact, when non-content conflicts occur
(such as file/directory, modify/delete, add/add with differing modes,
rename/rename (1to2), etc.), these informational messages are often the
only notification since these conflicts are not representable in the
contents of the file.
Add a --messages option which names a file so that callers can request
these messages be recorded somewhere.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
Documentation/git-merge-tree.txt | 6 ++++--
builtin/merge-tree.c | 18 ++++++++++++++++--
t/t4301-merge-tree-real.sh | 18 ++++++++++++++++++
3 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index 5823938937f..4d5857b390b 100644
--- a/Documentation/git-merge-tree.txt
+++ b/Documentation/git-merge-tree.txt
@@ -9,7 +9,7 @@ git-merge-tree - Perform merge without touching index or working tree
SYNOPSIS
--------
[verse]
-'git merge-tree' --real <branch1> <branch2>
+'git merge-tree' --real [--messages=<file>] <branch1> <branch2>
'git merge-tree' <base-tree> <branch1> <branch2>
DESCRIPTION
@@ -21,7 +21,9 @@ The first form will merge the two branches, doing a full recursive
merge with rename detection. If the merge is clean, the exit status
will be `0`, and if the merge has conflicts, the exit status will be
`1`. The output will consist solely of the resulting toplevel tree
-(which may have files including conflict markers).
+(which may have files including conflict markers). With `--messages`,
+it will write any informational messages (such as "Auto-merging
+<path>" and conflict notices) to the given file.
The second form is meant for backward compatibility and will only do a
trival merge. It reads three tree-ish, and outputs trivial merge
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index c5757bed5bb..47deef0b199 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -389,6 +389,7 @@ static int trivial_merge(const char *base,
struct merge_tree_options {
int real;
+ char *messages_file;
};
static int real_merge(struct merge_tree_options *o,
@@ -442,8 +443,15 @@ static int real_merge(struct merge_tree_options *o,
*/
merge_incore_recursive(&opt, merge_bases, parent1, parent2, &result);
+
+ if (o->messages_file) {
+ FILE *fp = xfopen(o->messages_file, "w");
+ merge_display_update_messages(&opt, &result, fp);
+ fclose(fp);
+ }
printf("%s\n", oid_to_hex(&result.tree->object.oid));
- merge_switch_to_result(&opt, NULL, &result, 0, 0);
+
+ merge_finalize(&opt, &result);
return result.clean ? 0 : 1;
}
@@ -451,15 +459,18 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
{
struct merge_tree_options o = { 0 };
int expected_remaining_argc;
+ int original_argc;
const char * const merge_tree_usage[] = {
- N_("git merge-tree --real <branch1> <branch2>"),
+ N_("git merge-tree --real [<options>] <branch1> <branch2>"),
N_("git merge-tree <base-tree> <branch1> <branch2>"),
NULL
};
struct option mt_options[] = {
OPT_BOOL(0, "real", &o.real,
N_("do a real merge instead of a trivial merge")),
+ OPT_STRING(0, "messages", &o.messages_file, N_("file"),
+ N_("filename to write informational/conflict messages to")),
OPT_END()
};
@@ -468,8 +479,11 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
usage_with_options(merge_tree_usage, mt_options);
/* Parse arguments */
+ original_argc = argc;
argc = parse_options(argc, argv, prefix, mt_options,
merge_tree_usage, 0);
+ if (!o.real && original_argc < argc)
+ die(_("--real must be specified if any other options are"));
expected_remaining_argc = (o.real ? 2 : 3);
if (argc != expected_remaining_argc)
usage_with_options(merge_tree_usage, mt_options);
diff --git a/t/t4301-merge-tree-real.sh b/t/t4301-merge-tree-real.sh
index 9fb617ccc7f..42218cdc019 100755
--- a/t/t4301-merge-tree-real.sh
+++ b/t/t4301-merge-tree-real.sh
@@ -78,4 +78,22 @@ test_expect_success 'Barf on too many arguments' '
grep "^usage: git merge-tree" expect
'
+test_expect_success '--messages gives us the conflict notices and such' '
+ test_must_fail git merge-tree --real --messages=MSG_FILE side1 side2 &&
+
+ # Expected results:
+ # "greeting" should merge with conflicts
+ # "numbers" should merge cleanly
+ # "whatever" has *both* a modify/delete and a file/directory conflict
+ cat <<-EOF >expect &&
+ Auto-merging greeting
+ CONFLICT (content): Merge conflict in greeting
+ Auto-merging numbers
+ CONFLICT (file/directory): directory in the way of whatever from side1; moving it to whatever~side1 instead.
+ CONFLICT (modify/delete): whatever~side1 deleted in side2 and modified in side1. Version side1 of whatever~side1 left in tree.
+ EOF
+
+ test_cmp expect MSG_FILE
+'
+
test_done
--
gitgitgadget
next prev parent reply other threads:[~2021-12-31 5:04 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-31 5:03 [PATCH 0/8] RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) Elijah Newren via GitGitGadget
2021-12-31 5:03 ` [PATCH 1/8] merge-tree: rename merge_trees() to trivial_merge_trees() Elijah Newren via GitGitGadget
2021-12-31 5:03 ` [PATCH 2/8] merge-tree: move logic for existing merge into new function Elijah Newren via GitGitGadget
2022-01-01 20:11 ` Johannes Altmanninger
2022-01-01 20:17 ` Elijah Newren
2021-12-31 5:03 ` [PATCH 3/8] merge-tree: add option parsing and initial shell for real merge function Elijah Newren via GitGitGadget
2021-12-31 5:04 ` [PATCH 4/8] merge-tree: implement real merges Elijah Newren via GitGitGadget
2022-01-01 20:08 ` Johannes Altmanninger
2022-01-01 21:11 ` Elijah Newren
2022-01-03 12:23 ` Fabian Stelzer
2022-01-03 16:37 ` Elijah Newren
2021-12-31 5:04 ` [PATCH 5/8] merge-ort: split out a separate display_update_messages() function Elijah Newren via GitGitGadget
2022-01-03 12:15 ` Fabian Stelzer
2022-01-03 12:25 ` Fabian Stelzer
2021-12-31 5:04 ` [PATCH 6/8] merge-ort: allow update messages to be written to different file stream Elijah Newren via GitGitGadget
2022-01-01 20:08 ` Johannes Altmanninger
2022-01-01 20:19 ` Elijah Newren
2021-12-31 5:04 ` Elijah Newren via GitGitGadget [this message]
2022-01-03 12:31 ` [PATCH 7/8] merge-tree: support saving merge messages to a separate file Fabian Stelzer
2022-01-03 16:51 ` Elijah Newren
2022-01-03 17:22 ` Fabian Stelzer
2022-01-03 19:46 ` Elijah Newren
2022-01-04 13:05 ` Fabian Stelzer
2022-01-03 12:35 ` Fabian Stelzer
2022-01-03 16:55 ` Elijah Newren
2021-12-31 5:04 ` [PATCH 8/8] merge-tree: provide an easy way to access which files have conflicts Elijah Newren via GitGitGadget
2022-01-05 17:27 ` [PATCH v2 0/8] RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) Elijah Newren via GitGitGadget
2022-01-05 17:27 ` [PATCH v2 1/8] merge-tree: rename merge_trees() to trivial_merge_trees() Elijah Newren via GitGitGadget
2022-01-05 17:27 ` [PATCH v2 2/8] merge-tree: move logic for existing merge into new function Elijah Newren via GitGitGadget
2022-01-05 17:27 ` [PATCH v2 3/8] merge-tree: add option parsing and initial shell for real merge function Elijah Newren via GitGitGadget
2022-01-05 17:27 ` [PATCH v2 4/8] merge-tree: implement real merges Elijah Newren via GitGitGadget
2022-01-07 15:30 ` Johannes Schindelin
2022-01-07 17:26 ` Elijah Newren
2022-01-07 18:22 ` Johannes Schindelin
2022-01-07 19:15 ` Elijah Newren
2022-01-07 20:56 ` Junio C Hamano
2022-01-11 13:39 ` Johannes Schindelin
2022-01-07 18:12 ` Christian Couder
2022-01-07 19:09 ` Elijah Newren
2022-01-05 17:27 ` [PATCH v2 5/8] merge-ort: split out a separate display_update_messages() function Elijah Newren via GitGitGadget
2022-01-05 17:27 ` [PATCH v2 6/8] merge-ort: allow update messages to be written to different file stream Elijah Newren via GitGitGadget
2022-01-05 17:27 ` [PATCH v2 7/8] merge-tree: support saving merge messages to a separate file Elijah Newren via GitGitGadget
2022-01-07 18:07 ` Johannes Schindelin
2022-01-08 1:02 ` Elijah Newren
2022-01-05 17:27 ` [PATCH v2 8/8] merge-tree: provide an easy way to access which files have conflicts Elijah Newren via GitGitGadget
2022-01-05 19:09 ` Ramsay Jones
2022-01-05 19:17 ` Elijah Newren
2022-01-07 19:36 ` Johannes Schindelin
2022-01-07 22:12 ` Elijah Newren
2022-02-22 13:03 ` Johannes Schindelin
2022-01-08 1:28 ` Elijah Newren
2022-02-22 13:05 ` Johannes Schindelin
2022-01-05 20:18 ` [PATCH v2 0/8] RFC: Server side merges (no ref updating, no commit creating, no touching worktree or index) Junio C Hamano
2022-01-05 22:35 ` Elijah Newren
2022-01-07 18:46 ` Christian Couder
2022-01-07 19:59 ` Elijah Newren
2022-01-07 21:26 ` René Scharfe
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=777de92d9f166793cddbb383f497518a5dedb9f4.1640927044.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=newren@gmail.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.
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 NNTP newsgroup(s).