From: Elijah Newren <newren@gmail.com>
To: <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Phillip Wood <phillip.wood@dunelm.org.uk>,
Linus Nilsson <Linus.Nilsson@trimma.se>,
Elijah Newren <newren@gmail.com>
Subject: [PATCH v3 14/15] merge-recursive: give callers of handle_content_merge() access to contents
Date: Fri, 5 Apr 2019 08:00:25 -0700 [thread overview]
Message-ID: <20190405150026.5260-15-newren@gmail.com> (raw)
In-Reply-To: <20190405150026.5260-1-newren@gmail.com>
Pass a merge_file_info struct to handle_content_merge() so that the
callers can access the oid and mode of the result afterward.
Signed-off-by: Elijah Newren <newren@gmail.com>
---
merge-recursive.c | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 938a526b20..2edfa01e43 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2982,7 +2982,8 @@ static int handle_modify_delete(struct merge_options *opt,
_("modify"), _("modified"));
}
-static int handle_content_merge(struct merge_options *opt,
+static int handle_content_merge(struct merge_file_info *mfi,
+ struct merge_options *opt,
const char *path,
int is_dirty,
const struct diff_filespec *o,
@@ -2991,7 +2992,6 @@ static int handle_content_merge(struct merge_options *opt,
struct rename_conflict_info *ci)
{
const char *reason = _("content");
- struct merge_file_info mfi;
unsigned df_conflict_remains = 0;
if (!is_valid(o))
@@ -3004,7 +3004,7 @@ static int handle_content_merge(struct merge_options *opt,
if (merge_mode_and_contents(opt, o, a, b, path,
opt->branch1, opt->branch2,
- opt->call_depth * 2, &mfi))
+ opt->call_depth * 2, mfi))
return -1;
/*
@@ -3013,13 +3013,13 @@ static int handle_content_merge(struct merge_options *opt,
* b) The merge matches what was in HEAD (content, mode, pathname)
* c) The target path is usable (i.e. not involved in D/F conflict)
*/
- if (mfi.clean && was_tracked_and_matches(opt, path, &mfi.blob) &&
+ if (mfi->clean && was_tracked_and_matches(opt, path, &mfi->blob) &&
!df_conflict_remains) {
int pos;
struct cache_entry *ce;
output(opt, 3, _("Skipped %s (merged same as existing)"), path);
- if (add_cacheinfo(opt, &mfi.blob, path,
+ if (add_cacheinfo(opt, &mfi->blob, path,
0, (!opt->call_depth && !is_dirty), 0))
return -1;
/*
@@ -3035,11 +3035,11 @@ static int handle_content_merge(struct merge_options *opt,
ce = opt->repo->index->cache[pos];
ce->ce_flags |= CE_SKIP_WORKTREE;
}
- return mfi.clean;
+ return mfi->clean;
}
- if (!mfi.clean) {
- if (S_ISGITLINK(mfi.blob.mode))
+ if (!mfi->clean) {
+ if (S_ISGITLINK(mfi->blob.mode))
reason = _("submodule");
output(opt, 1, _("CONFLICT (%s): Merge conflict in %s"),
reason, path);
@@ -3053,15 +3053,15 @@ static int handle_content_merge(struct merge_options *opt,
if (opt->call_depth) {
remove_file_from_index(opt->repo->index, path);
} else {
- if (!mfi.clean) {
+ if (!mfi->clean) {
if (update_stages(opt, path, o, a, b))
return -1;
} else {
int file_from_stage2 = was_tracked(opt, path);
if (update_stages(opt, path, NULL,
- file_from_stage2 ? &mfi.blob : NULL,
- file_from_stage2 ? NULL : &mfi.blob))
+ file_from_stage2 ? &mfi->blob : NULL,
+ file_from_stage2 ? NULL : &mfi->blob))
return -1;
}
@@ -3072,15 +3072,15 @@ static int handle_content_merge(struct merge_options *opt,
path);
}
output(opt, 1, _("Adding as %s instead"), new_path);
- if (update_file(opt, 0, &mfi.blob, new_path)) {
+ if (update_file(opt, 0, &mfi->blob, new_path)) {
free(new_path);
return -1;
}
free(new_path);
- mfi.clean = 0;
- } else if (update_file(opt, mfi.clean, &mfi.blob, path))
+ mfi->clean = 0;
+ } else if (update_file(opt, mfi->clean, &mfi->blob, path))
return -1;
- return !is_dirty && mfi.clean;
+ return !is_dirty && mfi->clean;
}
static int handle_rename_normal(struct merge_options *opt,
@@ -3091,7 +3091,8 @@ static int handle_rename_normal(struct merge_options *opt,
struct rename_conflict_info *ci)
{
/* Merge the content and write it out */
- return handle_content_merge(opt, path, was_dirty(opt, path),
+ struct merge_file_info mfi;
+ return handle_content_merge(&mfi, opt, path, was_dirty(opt, path),
o, a, b, ci);
}
@@ -3256,8 +3257,10 @@ static int process_entry(struct merge_options *opt,
a, b);
} else {
/* case D: Modified in both, but differently. */
+ struct merge_file_info mfi;
int is_dirty = 0; /* unpack_trees would have bailed if dirty */
- clean_merge = handle_content_merge(opt, path, is_dirty,
+ clean_merge = handle_content_merge(&mfi, opt, path,
+ is_dirty,
o, a, b, NULL);
}
} else if (!o_valid && !a_valid && !b_valid) {
--
2.21.0.211.g719c25afaf.dirty
next prev parent reply other threads:[~2019-04-05 15:01 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-27 12:47 [BUG] All files in folder are moved when cherry-picking commit that moves fewer files Linus Nilsson
2019-02-27 14:30 ` Phillip Wood
2019-02-27 16:02 ` Elijah Newren
2019-02-27 16:40 ` Jeff King
2019-02-27 17:31 ` Elijah Newren
2019-02-28 8:16 ` Linus Nilsson
2019-03-01 2:52 ` Junio C Hamano
2019-03-02 23:48 ` Elijah Newren
2019-03-03 1:33 ` Junio C Hamano
2019-03-06 0:27 ` Elijah Newren
2019-03-06 4:43 ` Junio C Hamano
2019-03-07 4:14 ` Elijah Newren
2019-03-07 5:45 ` Junio C Hamano
2019-03-07 5:45 ` Junio C Hamano
2019-03-30 0:33 ` [PATCH v2 00/15] Switch directory rename detection default Elijah Newren
2019-03-30 0:33 ` [PATCH v2 01/15] Use 'unsigned short' for mode, like diff_filespec does Elijah Newren
2019-03-30 0:33 ` [PATCH v2 02/15] merge-recursive: rename merge_options argument from 'o' to 'opt' Elijah Newren
2019-03-30 0:33 ` [PATCH v2 03/15] merge-recursive: rename diff_filespec 'one' to 'o' Elijah Newren
2019-03-30 0:33 ` [PATCH v2 04/15] merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf' Elijah Newren
2019-03-30 0:33 ` [PATCH v2 05/15] merge-recursive: use 'ci' for rename_conflict_info variable name Elijah Newren
2019-03-30 0:33 ` [PATCH v2 06/15] merge-recursive: move some struct declarations together Elijah Newren
2019-03-30 0:33 ` [PATCH v2 07/15] merge-recursive: shrink rename_conflict_info Elijah Newren
2019-03-30 0:33 ` [PATCH v2 08/15] merge-recursive: remove ren[12]_other fields from rename_conflict_info Elijah Newren
2019-03-30 0:33 ` [PATCH v2 09/15] merge-recursive: track branch where rename occurred in rename struct Elijah Newren
2019-03-30 0:33 ` [PATCH v2 10/15] merge-recursive: cleanup handle_rename_* function signatures Elijah Newren
2019-03-30 0:33 ` [PATCH v2 11/15] merge-recursive: switch from (oid,mode) pairs to a diff_filespec Elijah Newren
2019-03-30 0:33 ` [PATCH v2 12/15] t6043: fix copied test description to match its purpose Elijah Newren
2019-03-30 0:33 ` [PATCH v2 13/15] merge-recursive: track information associated with directory renames Elijah Newren
2019-03-30 0:33 ` [PATCH v2 14/15] merge-recursive: give callers of handle_content_merge() access to contents Elijah Newren
2019-03-30 0:33 ` [PATCH v2 15/15] merge-recursive: switch directory rename detection default Elijah Newren
2019-03-30 9:12 ` Ævar Arnfjörð Bjarmason
2019-04-01 15:41 ` Elijah Newren
2019-04-05 15:00 ` [PATCH v3 00/15] Switch " Elijah Newren
2019-04-05 15:00 ` [PATCH v3 01/15] Use 'unsigned short' for mode, like diff_filespec does Elijah Newren
2019-04-05 15:00 ` [PATCH v3 02/15] merge-recursive: rename merge_options argument from 'o' to 'opt' Elijah Newren
2019-04-05 15:00 ` [PATCH v3 03/15] merge-recursive: rename diff_filespec 'one' to 'o' Elijah Newren
2019-04-05 15:00 ` [PATCH v3 04/15] merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf' Elijah Newren
2019-04-05 15:00 ` [PATCH v3 05/15] merge-recursive: use 'ci' for rename_conflict_info variable name Elijah Newren
2019-04-05 15:00 ` [PATCH v3 06/15] merge-recursive: move some struct declarations together Elijah Newren
2019-04-05 15:00 ` [PATCH v3 07/15] merge-recursive: shrink rename_conflict_info Elijah Newren
2019-04-05 15:00 ` [PATCH v3 08/15] merge-recursive: remove ren[12]_other fields from rename_conflict_info Elijah Newren
2019-04-05 15:00 ` [PATCH v3 09/15] merge-recursive: track branch where rename occurred in rename struct Elijah Newren
2019-04-05 15:00 ` [PATCH v3 10/15] merge-recursive: cleanup handle_rename_* function signatures Elijah Newren
2019-04-05 15:00 ` [PATCH v3 11/15] merge-recursive: switch from (oid,mode) pairs to a diff_filespec Elijah Newren
2019-04-05 15:00 ` [PATCH v3 12/15] t6043: fix copied test description to match its purpose Elijah Newren
2019-04-05 15:00 ` [PATCH v3 13/15] merge-recursive: track information associated with directory renames Elijah Newren
2019-04-05 15:00 ` Elijah Newren [this message]
2019-04-05 15:00 ` [PATCH v3 15/15] merge-recursive: switch directory rename detection default Elijah Newren
2019-04-05 16:32 ` [PATCH v3 00/15] Switch " Jacob Keller
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=20190405150026.5260-15-newren@gmail.com \
--to=newren@gmail.com \
--cc=Linus.Nilsson@trimma.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=phillip.wood@dunelm.org.uk \
/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).