• Junio C Hamano's avatar
    Merge branch 'en/rename-directory-detection-reboot' · c67de747
    Junio C Hamano authored
    Rename detection logic in "diff" family that is used in "merge" has
    learned to guess when all of x/a, x/b and x/c have moved to z/a,
    z/b and z/c, it is likely that x/d added in the meantime would also
    want to move to z/d by taking the hint that the entire directory
    'x' moved to 'z'.  A bug causing dirty files involved in a rename
    to be overwritten during merge has also been fixed as part of this
    work.  Incidentally, this also avoids updating a file in the
    working tree after a (non-trivial) merge whose result matches what
    our side originally had.
    * en/rename-directory-detection-reboot: (36 commits)
      merge-recursive: fix check for skipability of working tree updates
      merge-recursive: make "Auto-merging" comment show for other merges
      merge-recursive: fix remainder of was_dirty() to use original index
      merge-recursive: fix was_tracked() to quit lying with some renamed paths
      t6046: testcases checking whether updates can be skipped in a merge
      merge-recursive: avoid triggering add_cacheinfo error with dirty mod
      merge-recursive: move more is_dirty handling to merge_content
      merge-recursive: improve add_cacheinfo error handling
      merge-recursive: avoid spurious rename/rename conflict from dir renames
      directory rename detection: new testcases showcasing a pair of bugs
      merge-recursive: fix remaining directory rename + dirty overwrite cases
      merge-recursive: fix overwriting dirty files involved in renames
      merge-recursive: avoid clobbering untracked files with directory renames
      merge-recursive: apply necessary modifications for directory renames
      merge-recursive: when comparing files, don't include trees
      merge-recursive: check for file level conflicts then get new name
      merge-recursive: add computation of collisions due to dir rename & merging
      merge-recursive: check for directory level conflicts
      merge-recursive: add get_directory_renames()
      merge-recursive: make a helper function for cleanup for handle_renames
strbuf.h 21.6 KB