| commit | 05b85c6eeb1710ff83f11f71abefa2064e50e61b | |
| author | Elijah Newren <newren@gmail.com> | |
| Tue, 19 Jan 2021 19:53:50 +0000 (19 19:53 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Jan 2021 06:18:55 +0000 (20 22:18 -0800) | ||
| tree | 5e44ec1210cdc265351fa2ddeff9c1198785da53 | treesnapshot (tar.gz zip) |
| parent | bea433655a79b7fbc04444508c55f13ece942a21 | commitdiff |
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>
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>
| merge-ort.c | diffblobblamehistory |