diff options
| author | Elijah Newren <newren@gmail.com> | 2021-03-13 23:22:03 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-18 22:32:55 +0100 |
| commit | fb52938eec1cf6ec3169152362fe774849f5ac9b (patch) | |
| tree | 8b2d642a6de67a15bb963c4171688e675deacaa2 /diffcore.h | |
| parent | merge-ort, diffcore-rename: tweak dirs_removed and relevant_source type (diff) | |
| download | git-fb52938eec1cf6ec3169152362fe774849f5ac9b.tar.xz git-fb52938eec1cf6ec3169152362fe774849f5ac9b.zip | |
merge-ort: record the reason that we want a rename for a directory
When one side of history renames a directory, and the other side of
history added files to the old directory, directory rename detection is
used to warn about the location of the added files so the user can
move them to the old directory or keep them with the new one.
This sets up three different types of directories:
* directories that had new files added to them
* directories underneath a directory that had new files added to them
* directories where no new files were added to it or any leading path
Save this information in dirs_removed; the next several commits will
make use of this information.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index 4f168b385f..d5a497b7a1 100644 --- a/diffcore.h +++ b/diffcore.h @@ -161,6 +161,13 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *, struct diff_filespec *); void diff_q(struct diff_queue_struct *, struct diff_filepair *); +/* dir_rename_relevance: the reason we want rename information for a dir */ +enum dir_rename_relevance { + NOT_RELEVANT = 0, + RELEVANT_FOR_ANCESTOR = 1, + RELEVANT_FOR_SELF = 2 +}; + void partial_clear_dir_rename_count(struct strmap *dir_rename_count); void diffcore_break(struct repository *, int); |