diff options
author | Elijah Newren <newren@gmail.com> | 2018-04-19 10:58:21 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 16:11:00 +0900 |
commit | 277292d5ae27993d36f35fdd8d561c369b1e0962 (patch) | |
tree | 4530980d5d562b852fb4e9e7c096073a379dd286 /Documentation/technical/bitmap-format.txt | |
parent | merge-recursive: fix was_tracked() to quit lying with some renamed paths (diff) | |
download | tgif-277292d5ae27993d36f35fdd8d561c369b1e0962.tar.xz |
merge-recursive: fix remainder of was_dirty() to use original index
was_dirty() uses was_tracked(), which has been updated to use the original
index rather than the current one. However, was_dirty() also had a
separate call to cache_file_exists(), causing it to still implicitly use
the current index. Update that to instead use index_file_exists().
Also, was_dirty() had a hack where it would mark any file as non-dirty if
we simply didn't know its modification time. This was due to using the
current index rather than the original index, because D/F conflicts and
such would cause unpack_trees() to not copy the modification times from
the original index to the current one. Now that we are using the original
index, we can dispense with this hack.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/bitmap-format.txt')
0 files changed, 0 insertions, 0 deletions