From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Alex Henrie <alexhenrie24@gmail.com>,
Richard Hansen <rhansen@rhansen.org>,
Junio C Hamano <gitster@pobox.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [RFC PATCH 15/35] update: fake a reverse order of parents in message
Date: Mon, 5 Jul 2021 07:31:49 -0500 [thread overview]
Message-ID: <20210705123209.1808663-16-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210705123209.1808663-1-felipe.contreras@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/merge.c | 1 +
fmt-merge-msg.c | 21 +++++++++++++++++++--
fmt-merge-msg.h | 3 ++-
t/t5563-update.sh | 10 +++++++++-
4 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index b9c6c43d8f..cb476958ad 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1136,6 +1136,7 @@ static void prepare_merge_message(struct strbuf *merge_names, struct strbuf *mer
opts.add_title = !have_message;
opts.shortlog_len = shortlog_len;
opts.credit_people = (0 < option_edit);
+ opts.reverse_parents = reverse_parents;
fmt_merge_msg(merge_names, merge_msg, &opts);
if (merge_msg->len)
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
index 0f66818e0f..1f840711cc 100644
--- a/fmt-merge-msg.c
+++ b/fmt-merge-msg.c
@@ -432,6 +432,19 @@ static int dest_suppressed(const char *dest_branch)
return 0;
}
+static void fmt_update_msg_title(struct strbuf *out, const char *current_branch)
+{
+ struct src_data *src_data;
+ strbuf_addf(out, "Merge branch '%s'", current_branch);
+ src_data = srcs.items[0].util;
+ if (src_data->branch.nr) {
+ const char *branch_name = src_data->branch.items[0].string;
+ if (!dest_suppressed(branch_name))
+ strbuf_addf(out, " into %s", branch_name);
+ }
+ strbuf_addch(out, '\n');
+}
+
static void fmt_merge_msg_title(struct strbuf *out,
const char *current_branch)
{
@@ -665,8 +678,12 @@ int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
die("error in line %d: %.*s", i, len, p);
}
- if (opts->add_title && srcs.nr)
- fmt_merge_msg_title(out, current_branch);
+ if (opts->add_title && srcs.nr) {
+ if (opts->reverse_parents)
+ fmt_update_msg_title(out, current_branch);
+ else
+ fmt_merge_msg_title(out, current_branch);
+ }
if (origins.nr)
fmt_merge_msg_sigs(out);
diff --git a/fmt-merge-msg.h b/fmt-merge-msg.h
index f2ab0e0085..fbdb1c905e 100644
--- a/fmt-merge-msg.h
+++ b/fmt-merge-msg.h
@@ -7,7 +7,8 @@
struct fmt_merge_msg_opts {
unsigned add_title:1,
- credit_people:1;
+ credit_people:1,
+ reverse_parents:1;
int shortlog_len;
};
diff --git a/t/t5563-update.sh b/t/t5563-update.sh
index 72d6a357a1..aabbf5a965 100755
--- a/t/t5563-update.sh
+++ b/t/t5563-update.sh
@@ -7,6 +7,13 @@ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
+check_msg () {
+ test "$2" != "master" && into=" into '$2'"
+ echo "Merge branch '$1'${into}" > expected
+ git log -1 --format=%s > actual &&
+ test_cmp expected actual
+}
+
test_expect_success 'setup' '
echo one > file &&
git add file &&
@@ -55,7 +62,8 @@ test_expect_success 'git update non-fast-forward with merge' '
git reset --hard master &&
git update --merge &&
test_cmp_rev @^2 master &&
- test_cmp_rev @^1 other
+ test_cmp_rev @^1 other &&
+ check_msg test other
)
'
--
2.32.0.36.g70aac2b1aa
next prev parent reply other threads:[~2021-07-05 12:32 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-05 12:31 [RFC PATCH 00/35] git update: fix broken git pull Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 01/35] merge: improve fatal fast-forward message Felipe Contreras
2021-07-06 20:07 ` Ævar Arnfjörð Bjarmason
2021-07-06 20:39 ` Felipe Contreras
2021-07-06 20:48 ` Randall S. Becker
2021-07-06 20:56 ` Junio C Hamano
2021-07-06 21:15 ` Felipe Contreras
2021-07-06 21:31 ` Randall S. Becker
2021-07-06 21:54 ` Junio C Hamano
2021-07-06 22:26 ` Randall S. Becker
2021-07-06 21:11 ` Felipe Contreras
2021-07-06 21:27 ` Randall S. Becker
2021-07-06 22:14 ` Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 02/35] merge: split cmd_merge() Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 03/35] fast-forward: add new builtin Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 04/35] doc: fast-forward: explain what it is Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 05/35] fast-forward: add advice for novices Felipe Contreras
2021-07-06 20:09 ` Ævar Arnfjörð Bjarmason
2021-07-06 20:42 ` Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 06/35] fast-forward: make the advise configurable Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 07/35] fast-forward: add help about merge vs. rebase Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 08/35] update: new built-in Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 09/35] update: add options and usage skeleton Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 10/35] update: add --ff option Felipe Contreras
2021-07-06 20:12 ` Ævar Arnfjörð Bjarmason
2021-07-06 20:46 ` Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 11/35] update: add --merge mode Felipe Contreras
2021-07-06 20:13 ` Ævar Arnfjörð Bjarmason
2021-07-06 20:51 ` Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 12/35] commit: support for multiple MERGE_MODE Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 13/35] merge: add --reverse-parents option Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 14/35] update: reverse the order of parents Felipe Contreras
2021-07-05 12:31 ` Felipe Contreras [this message]
2021-07-05 12:31 ` [RFC PATCH 16/35] update: add --rebase mode Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 17/35] update: add mode configuation Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 18/35] update: add per-branch mode configuration Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 19/35] pull: cleanup autostash check Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 20/35] pull: trivial cleanup Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 21/35] pull: trivial whitespace style fix Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 22/35] pull: introduce --merge option Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 23/35] rebase: add REBASE_DEFAULT Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 24/35] pull: move configuration fetches Felipe Contreras
2021-07-05 12:31 ` [RFC PATCH 25/35] pull: show warning with --ff options Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 26/35] pull: add pull.mode Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 27/35] pull: add per-branch mode configuration Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 28/35] pull: add pull.mode=fast-forward Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 29/35] pull: reorganize mode conditionals Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 30/35] pull: add diverging advice on fast-forward mode Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 31/35] pull: improve --rebase and pull.rebase interaction Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 32/35] pull: improve default warning Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 33/35] pull: advice of future changes Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 34/35] FUTURE: pull: enable ff-only mode by default Felipe Contreras
2021-07-05 12:32 ` [RFC PATCH 35/35] !fixup " Felipe Contreras
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=20210705123209.1808663-16-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rhansen@rhansen.org \
/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).