diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-19 08:32:26 -0700 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-06-20 15:37:32 -0400 |
| commit | 96dd171e34fbb89d5ff5eb320c00db82b9ed3942 (patch) | |
| tree | 12a051e50a7ceb8a5f1f0de948a46890028432ed /src/diff.h | |
| parent | fc6568021c301ff4ebefe22814498ba07fe60b9c (diff) | |
| download | libgit2-96dd171e34fbb89d5ff5eb320c00db82b9ed3942.tar.gz | |
diff: preserve original mode in the index
When updating the index during a diff, preserve the original mode,
which prevents us from dropping the mode to what we have interpreted
as on our system (eg, what the working directory claims it to be,
which may be a lie on some systems.)
Diffstat (limited to 'src/diff.h')
| -rw-r--r-- | src/diff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/diff.h b/src/diff.h index 3305238d0..2a35fd9ac 100644 --- a/src/diff.h +++ b/src/diff.h @@ -94,7 +94,7 @@ extern int git_diff_delta__format_file_header( extern int git_diff__oid_for_file( git_oid *out, git_diff *, const char *, uint16_t, git_off_t); extern int git_diff__oid_for_entry( - git_oid *out, git_diff *, const git_index_entry *, const git_oid *update); + git_oid *out, git_diff *, const git_index_entry *, uint16_t, const git_oid *update); extern int git_diff__from_iterators( git_diff **diff_ptr, |