From: Derrick Stolee <stolee@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, peff@peff.net, jnareb@gmail.com,
pclouds@gmail.com, carenas@gmail.com, avarab@gmail.com,
Junio C Hamano <gitster@pobox.com>,
Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH 5/5] repo-settings: create feature.experimental setting
Date: Wed, 24 Jul 2019 21:47:27 -0400 [thread overview]
Message-ID: <b9843571-5358-a33e-40cf-0d6d30d30766@gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1907231708280.21907@tvgsbejvaqbjf.bet>
On 7/23/2019 11:20 AM, Johannes Schindelin wrote:
> Hi Stolee,
>
> On Mon, 22 Jul 2019, Derrick Stolee via GitGitGadget wrote:
>> struct path_hashmap_entry {
>> struct hashmap_entry e;
>> @@ -1375,10 +1376,14 @@ static int handle_rename_via_dir(struct merge_options *opt,
>> * there is no content merge to do; just move the file into the
>> * desired final location.
>> */
>> + struct repository *r = the_repository;
>> const struct rename *ren = ci->ren1;
>> const struct diff_filespec *dest = ren->pair->two;
>> char *file_path = dest->path;
>> - int mark_conflicted = (opt->detect_directory_renames == 1);
>
> I actually don't think that we want to do that; the `opt` parameter is
> passed to the merge recursive algorithm specifically so that it can be
> overridden by the caller.
>
> Instead, what we should do, I think, is to change `init_merge_options()`
> (which already gets a parameter of type `struct repository *`) so that
> it does not hard-code the `detect_directory_renames` value to `1` but to
> query the repo settings instead.
[snip]
>> @@ -3687,7 +3690,6 @@ void init_merge_options(struct merge_options *opt,
>> opt->renormalize = 0;
>> opt->diff_detect_rename = -1;
>> opt->merge_detect_rename = -1;
>> - opt->detect_directory_renames = 1;
>
> In other words: here.
Yes, thanks! Your suggestion makes much more sense and makes the diff
much simpler. No reason to couple too closely to the config storage here.
I think you gave me enough feedback to merit a v2 before others chime
in, so I'll send one after I validate my current version.
Thanks,
-Stolee
next prev parent reply other threads:[~2019-07-25 1:47 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-22 17:54 [PATCH 0/5] Create 'feature.*' config area and some centralized config parsing Derrick Stolee via GitGitGadget
2019-07-22 17:54 ` [PATCH 1/5] repo-settings: consolidate some config settings Derrick Stolee via GitGitGadget
2019-07-23 13:12 ` Johannes Schindelin
2019-07-22 17:54 ` [PATCH 2/5] repo-settings: add feature.manyCommits setting Derrick Stolee via GitGitGadget
2019-07-23 14:53 ` Johannes Schindelin
2019-07-24 10:41 ` Derrick Stolee
2019-07-22 17:54 ` [PATCH 3/5] repo-settings: parse core.untrackedCache Derrick Stolee via GitGitGadget
2019-07-23 15:04 ` Johannes Schindelin
2019-07-24 19:27 ` Derrick Stolee
2019-07-22 17:54 ` [PATCH 4/5] repo-settings: create feature.manyFiles setting Derrick Stolee via GitGitGadget
2019-07-22 17:54 ` [PATCH 5/5] repo-settings: create feature.experimental setting Derrick Stolee via GitGitGadget
2019-07-23 15:20 ` Johannes Schindelin
2019-07-25 1:47 ` Derrick Stolee [this message]
2019-07-25 2:23 ` [PATCH v2 0/5] Create 'feature.*' config area and some centralized config parsing Derrick Stolee via GitGitGadget
2019-07-25 2:23 ` [PATCH v2 1/5] repo-settings: consolidate some config settings Derrick Stolee via GitGitGadget
2019-07-25 9:30 ` Johannes Schindelin
2019-07-25 2:23 ` [PATCH v2 2/5] repo-settings: add feature.manyCommits setting Derrick Stolee via GitGitGadget
2019-07-25 2:23 ` [PATCH v2 3/5] repo-settings: parse core.untrackedCache Derrick Stolee via GitGitGadget
2019-07-25 9:36 ` Johannes Schindelin
2019-07-25 2:23 ` [PATCH v2 4/5] repo-settings: create feature.manyFiles setting Derrick Stolee via GitGitGadget
2019-07-25 2:23 ` [PATCH v2 5/5] repo-settings: create feature.experimental setting Derrick Stolee via GitGitGadget
2019-07-25 9:40 ` [PATCH v2 0/5] Create 'feature.*' config area and some centralized config parsing Johannes Schindelin
2019-07-30 19:35 ` [PATCH v3 " Derrick Stolee via GitGitGadget
2019-07-30 19:35 ` [PATCH v3 1/5] repo-settings: consolidate some config settings Derrick Stolee via GitGitGadget
2019-07-30 20:47 ` Junio C Hamano
2019-07-30 19:35 ` [PATCH v3 2/5] repo-settings: add feature.manyCommits setting Derrick Stolee via GitGitGadget
2019-07-30 20:57 ` Junio C Hamano
2019-07-31 13:17 ` Johannes Schindelin
2019-07-31 15:48 ` Junio C Hamano
2019-07-31 15:01 ` Ævar Arnfjörð Bjarmason
2019-08-01 18:27 ` Derrick Stolee
2019-07-30 19:35 ` [PATCH v3 3/5] repo-settings: parse core.untrackedCache Derrick Stolee via GitGitGadget
2019-07-30 19:35 ` [PATCH v3 4/5] repo-settings: create feature.manyFiles setting Derrick Stolee via GitGitGadget
2019-07-30 19:35 ` [PATCH v3 5/5] repo-settings: create feature.experimental setting Derrick Stolee via GitGitGadget
2019-08-08 18:34 ` Elijah Newren
2019-08-08 18:48 ` Derrick Stolee
2019-08-08 18:59 ` Junio C Hamano
2019-08-08 19:12 ` Derrick Stolee
2019-08-08 20:31 ` Elijah Newren
2019-08-08 20:49 ` Derrick Stolee
2019-08-08 19:19 ` Elijah Newren
2019-08-08 20:07 ` Junio C Hamano
2019-08-08 20:46 ` Derrick Stolee
2019-08-13 18:37 ` [PATCH v4 0/6] Create 'feature.*' config area and some centralized config parsing Derrick Stolee via GitGitGadget
2019-08-13 18:37 ` [PATCH v4 1/6] repo-settings: consolidate some config settings Derrick Stolee via GitGitGadget
2019-08-13 18:37 ` [PATCH v4 3/6] commit-graph: turn on commit-graph by default Derrick Stolee via GitGitGadget
2021-09-20 0:42 ` Junio C Hamano
2021-09-20 1:22 ` Ævar Arnfjörð Bjarmason
2021-09-20 1:25 ` brian m. carlson
2021-09-20 12:53 ` Phillip Wood
2021-09-20 13:30 ` Ævar Arnfjörð Bjarmason
2021-09-20 18:00 ` Phillip Wood
2021-09-20 19:18 ` Jeff King
2019-08-13 18:37 ` [PATCH v4 2/6] t6501: use 'git gc' in quiet mode Derrick Stolee via GitGitGadget
2019-08-13 18:37 ` [PATCH v4 4/6] repo-settings: parse core.untrackedCache Derrick Stolee via GitGitGadget
2019-08-13 18:37 ` [PATCH v4 5/6] repo-settings: create feature.manyFiles setting Derrick Stolee via GitGitGadget
2019-08-13 18:37 ` [PATCH v4 6/6] repo-settings: create feature.experimental setting Derrick Stolee via GitGitGadget
2019-08-13 21:04 ` [PATCH v4 0/6] Create 'feature.*' config area and some centralized config parsing Junio C Hamano
2019-08-13 21:08 ` Junio C Hamano
2019-08-14 10:32 ` Derrick Stolee
2019-08-14 10:38 ` Derrick Stolee
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=b9843571-5358-a33e-40cf-0d6d30d30766@gmail.com \
--to=stolee@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=carenas@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/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).