Re: Optimizing writes to unchanged files during merges?
- From
Linus Torvalds <torvalds@linux-foundation.org>
- Date
- Apr 12, 2018, 23:41 UTC
- Message-ID
- <CA+55aFwM2CaafNGq8_=GkYAw9inpm-4xcyHUmKprLv4Gb3-aVg@mail.gmail.com>
- In-Reply-To
- <CA+55aFxA9YVLoh_23V8Hi+X7ODEmqg-dhdAYZz1jbq5JhXqBFw@mail.gmail.com>
On Thu, Apr 12, 2018 at 4:35 PM, Linus Torvalds <torvalds@linux-foundation.org> wrote:
> > in process_entry(), and I think we could just there add a test for if > o_old,o_mod == a_oid,a_mode or something?
Actually, not process_entry, but merge_content().
Oddly, that *already* has the check:
if (mfi.clean && !df_conflict_remains &&
oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) {
int path_renamed_outside_HEAD;
output(o, 3, _("Skipped %s (merged same as existing)"), path);but that doesn't seem to actually trigger for some reason.
But the code really seems to have the _intention_ of skipping the case where the result ended up the same as the source.
Maybe I'm missing something.
Linus