diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-01-19 19:53:50 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-01-20 22:18:55 -0800 |
| commit | 05b85c6eeb1710ff83f11f71abefa2064e50e61b (patch) | |
| tree | 5e44ec1210cdc265351fa2ddeff9c1198785da53 /t/annotate-tests.sh | |
| parent | merge-ort: implement handle_path_level_conflicts() (diff) | |
| download | tgif-05b85c6eeb1710ff83f11f71abefa2064e50e61b.tar.xz | |
merge-ort: add a new toplevel_dir field
Due to the string-equality-iff-pointer-equality requirements placed on
merged_info.directory_name, apply_directory_rename_modifications() will
need to have access to the exact toplevel directory name string pointer
and can't just use a new empty string. Store it in a field that we can
use.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/annotate-tests.sh')
0 files changed, 0 insertions, 0 deletions