Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fast track bug fix to merge-recursive #3

Merged
merged 2 commits into from
Aug 7, 2018
Merged

Fast track bug fix to merge-recursive #3

merged 2 commits into from
Aug 7, 2018

Commits on Jul 26, 2018

  1. t3507: add a testcase showing failure with sparse checkout 

    Recent changes in merge_content() induced a bug when merging files that are
not present in the local working directory due to sparse-checkout. Add a
test case to demonstrate the bug so that we can ensure the fix resolves
it and to prevent future regressions.

Signed-off-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
    @benpeart
    benpeart committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    f8acb80 View commit details
    Browse the repository at this point in the history

  2. merge-recursive: preserve skip_worktree bit when necessary 

    merge-recursive takes any files marked as unmerged by unpack_trees,
tries to figure out whether they can be resolved (e.g. using renames
or a file-level merge), and then if they can be it will delete the old
cache entries and writes new ones.  This means that any ce_flags for
those cache entries are essentially cleared when merging.

Unfortunately, if a file was marked as skip_worktree and it needs a
file-level merge but the merge results in the same version of the file
that was found in HEAD, we skip updating the worktree (because the
file was unchanged) but clear the skip_worktree bit (because of the
delete-cache-entry-and-write-new-one).  This makes git treat the file
as having a local change in the working copy, namely a delete, when it
should appear as unchanged despite not being present.  Avoid this
problem by copying the skip_worktree flag in this case.

Signed-off-by: Elijah Newren <newren@gmail.com>
    @newren @benpeart
    newren authored and benpeart committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    3f047ee View commit details
    Browse the repository at this point in the history