diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-05-08 18:37:22 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-05-08 18:37:22 +0300 |
commit | 96379f043f4d49de265c73430e74b8b6c7686e1c (patch) | |
tree | ab24bad280ed88602137b2dfb27b1d5ac7469c28 /sha1-name.c | |
parent | 83232e38648b51abbcbdb56c94632b6906cc85a6 (diff) | |
parent | 8c8e5bd6eb331d055aa7fa6345f6dcdadd658979 (diff) |
Merge branch 'en/merge-directory-renames'
"git merge-recursive" backend recently learned a new heuristics to
infer file movement based on how other files in the same directory
moved. As this is inherently less robust heuristics than the one
based on the content similarity of the file itself (rather than
based on what its neighbours are doing), it sometimes gives an
outcome unexpected by the end users. This has been toned down to
leave the renamed paths in higher/conflicted stages in the index so
that the user can examine and confirm the result.
* en/merge-directory-renames:
merge-recursive: switch directory rename detection default
merge-recursive: give callers of handle_content_merge() access to contents
merge-recursive: track information associated with directory renames
t6043: fix copied test description to match its purpose
merge-recursive: switch from (oid,mode) pairs to a diff_filespec
merge-recursive: cleanup handle_rename_* function signatures
merge-recursive: track branch where rename occurred in rename struct
merge-recursive: remove ren[12]_other fields from rename_conflict_info
merge-recursive: shrink rename_conflict_info
merge-recursive: move some struct declarations together
merge-recursive: use 'ci' for rename_conflict_info variable name
merge-recursive: rename locals 'o' and 'a' to 'obuf' and 'abuf'
merge-recursive: rename diff_filespec 'one' to 'o'
merge-recursive: rename merge_options argument from 'o' to 'opt'
Use 'unsigned short' for mode, like diff_filespec does
Diffstat (limited to 'sha1-name.c')
-rw-r--r-- | sha1-name.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1-name.c b/sha1-name.c index 07c71a7567..7754d3a3de 100644 --- a/sha1-name.c +++ b/sha1-name.c @@ -1608,7 +1608,7 @@ static void diagnose_invalid_oid_path(const char *prefix, int object_name_len) { struct object_id oid; - unsigned mode; + unsigned short mode; if (!prefix) prefix = ""; |