From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org, leif.middelschulte@gmail.com
Cc: gitster@pobox.com, newren@gmail.com, Stefan Beller <sbeller@google.com>
Subject: [PATCH 2/3] merge-recursive: i18n submodule merge output and respect verbosity
Date: Tue, 15 May 2018 13:00:29 -0700 [thread overview]
Message-ID: <20180515200030.88731-5-sbeller@google.com> (raw)
In-Reply-To: <20180515200030.88731-1-sbeller@google.com>
The submodule merge code now uses the output() function that is used by
all the rest of the merge-recursive-code. This allows for respecting
internationalisation as well as the verbosity setting.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
merge-recursive.c | 33 +++++++++++++++------------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 700ba15bf88..0571919ee0a 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1048,18 +1048,17 @@ static void print_commit(struct commit *commit)
strbuf_release(&sb);
}
-#define MERGE_WARNING(path, msg) \
- warning("Failed to merge submodule %s (%s)", path, msg);
-
-static int merge_submodule(struct object_id *result, const char *path,
+static int merge_submodule(struct merge_options *o,
+ struct object_id *result, const char *path,
const struct object_id *base, const struct object_id *a,
- const struct object_id *b, int search)
+ const struct object_id *b)
{
struct commit *commit_base, *commit_a, *commit_b;
int parent_count;
struct object_array merges;
int i;
+ int search = !o->call_depth;
/* store a in result in case we fail */
oidcpy(result, a);
@@ -1073,21 +1072,21 @@ static int merge_submodule(struct object_id *result, const char *path,
return 0;
if (add_submodule_odb(path)) {
- MERGE_WARNING(path, "not checked out");
+ output(o, 1, _("Failed to merge submodule %s (not checked out)"), path);
return 0;
}
if (!(commit_base = lookup_commit_reference(base)) ||
!(commit_a = lookup_commit_reference(a)) ||
!(commit_b = lookup_commit_reference(b))) {
- MERGE_WARNING(path, "commits not present");
+ output(o, 1, _("Failed to merge submodule %s (commits not present)"), path);
return 0;
}
/* check whether both changes are forward */
if (!in_merge_bases(commit_base, commit_a) ||
!in_merge_bases(commit_base, commit_b)) {
- MERGE_WARNING(path, "commits don't follow merge-base");
+ output(o, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path);
return 0;
}
@@ -1116,25 +1115,24 @@ static int merge_submodule(struct object_id *result, const char *path,
parent_count = find_first_merges(&merges, path, commit_a, commit_b);
switch (parent_count) {
case 0:
- MERGE_WARNING(path, "merge following commits not found");
+ output(o, 1, _("Failed to merge submodule %s (merge following commits not found)"), path);
break;
case 1:
- MERGE_WARNING(path, "not fast-forward");
- fprintf(stderr, "Found a possible merge resolution "
- "for the submodule:\n");
+ output(o, 1, _("Failed to merge submodule %s (not fast-forward)"), path);
+ output(o, 2, _("Found a possible merge resolution for the submodule:\n"));
print_commit((struct commit *) merges.objects[0].item);
- fprintf(stderr,
+ output(o, 2, _(
"If this is correct simply add it to the index "
"for example\n"
"by using:\n\n"
" git update-index --cacheinfo 160000 %s \"%s\"\n\n"
- "which will accept this suggestion.\n",
+ "which will accept this suggestion.\n"),
oid_to_hex(&merges.objects[0].item->oid), path);
break;
default:
- MERGE_WARNING(path, "multiple merges found");
+ output(o, 1, _("Failed to merge submodule %s (multiple merges found)"), path);
for (i = 0; i < merges.nr; i++)
print_commit((struct commit *) merges.objects[i].item);
}
@@ -1205,12 +1203,11 @@ static int merge_file_1(struct merge_options *o,
return ret;
result->clean = (merge_status == 0);
} else if (S_ISGITLINK(a->mode)) {
- result->clean = merge_submodule(&result->oid,
+ result->clean = merge_submodule(o, &result->oid,
one->path,
&one->oid,
&a->oid,
- &b->oid,
- !o->call_depth);
+ &b->oid);
} else if (S_ISLNK(a->mode)) {
switch (o->recursive_variant) {
case MERGE_RECURSIVE_NORMAL:
--
2.17.0.582.gccdcbd54c44.dirty
next prev parent reply other threads:[~2018-05-15 20:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-15 20:00 [PATCHv2 0/3] Reroll of sb/submodule-merge-in-merge-recursive Stefan Beller
2018-05-15 20:00 ` [PATCH] git-submodule.sh: try harder to fetch a submodule Stefan Beller
2018-05-15 20:00 ` [PATCH] grep: handle corrupt index files early Stefan Beller
2018-05-15 20:00 ` [PATCH 1/3] submodule.c: move submodule merging to merge-recursive.c Stefan Beller
2018-05-15 20:00 ` Stefan Beller [this message]
2018-05-16 1:17 ` [PATCH 2/3] merge-recursive: i18n submodule merge output and respect verbosity Junio C Hamano
2018-05-15 20:00 ` [PATCH 3/3] Inform about fast-forwarding of submodules during merge Stefan Beller
2018-05-16 1:36 ` Elijah Newren
2018-05-16 1:36 ` Junio C Hamano
2018-05-16 1:42 ` Junio C Hamano
2018-06-04 18:48 ` [PATCH v4 0/1] merge-recursive: give notice when submodule commit gets fast-forwarded Leif Middelschulte
2018-06-04 18:48 ` [PATCH 1/1] " Leif Middelschulte
2018-06-07 5:22 ` Elijah Newren
2018-06-11 17:31 ` [PATCH] merge-submodule: reduce output verbosity Leif Middelschulte
2018-06-11 18:04 ` Junio C Hamano
2018-06-11 19:07 ` Leif Middelschulte
2018-05-15 20:02 ` [PATCHv2 0/3] Reroll of sb/submodule-merge-in-merge-recursive Stefan Beller
2018-05-15 20:15 ` Leif Middelschulte
2018-05-15 20:49 ` Stefan Beller
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=20180515200030.88731-5-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=leif.middelschulte@gmail.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.
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).