diff options
| author | Russell Belfer <rb@github.com> | 2014-04-28 14:34:55 -0700 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2014-05-02 09:21:33 -0700 |
| commit | 0fc8e1f6bd9a5148d3a262142e9a70126f5c3a42 (patch) | |
| tree | 7941140dacf3a0b820363280ecdca2790cf5cdf3 /src/checkout.c | |
| parent | 8ef4e11a76599111b98682d235e7a4df921b2597 (diff) | |
| download | libgit2-0fc8e1f6bd9a5148d3a262142e9a70126f5c3a42.tar.gz | |
Lay groundwork for updating stat cache in diff
This reorganized the diff OID calculation to make it easier to
correctly update the stat cache during a diff once the flags to
do so are enabled.
This includes marking the path of a git_index_entry as const so
we can make a "fake" git_index_entry with a "const char *" path
and not get warnings. I was a little surprised at how unobtrusive
this change was, but I think it's probably a good thing.
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/checkout.c b/src/checkout.c index 93d6bc9c5..d94cb0c7d 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -184,8 +184,7 @@ static bool checkout_is_workdir_modified( if (baseitem->size && wditem->file_size != baseitem->size) return true; - if (git_diff__oid_for_file( - &oid, data->diff, wditem->path, wditem->mode, wditem->file_size) < 0) + if (git_diff__oid_for_entry(&oid, data->diff, wditem) < 0) return false; return (git_oid__cmp(&baseitem->id, &oid) != 0); |