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.c | |
| 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.c')
| -rw-r--r-- | src/diff.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/diff.c b/src/diff.c index c9d1d8730..d7365ef77 100644 --- a/src/diff.c +++ b/src/diff.c @@ -570,7 +570,7 @@ int git_diff__oid_for_file( git_oid *out, git_diff *diff, const char *path, - uint16_t mode, + uint16_t mode, git_off_t size) { git_index_entry entry; @@ -580,13 +580,14 @@ int git_diff__oid_for_file( entry.file_size = size; entry.path = (char *)path; - return git_diff__oid_for_entry(out, diff, &entry, NULL); + return git_diff__oid_for_entry(out, diff, &entry, mode, NULL); } int git_diff__oid_for_entry( git_oid *out, git_diff *diff, const git_index_entry *src, + uint16_t mode, const git_oid *update_match) { int error = 0; @@ -600,7 +601,7 @@ int git_diff__oid_for_entry( &full_path, git_repository_workdir(diff->repo), entry.path) < 0) return -1; - if (!entry.mode) { + if (!mode) { struct stat st; diff->perf.stat_calls++; @@ -616,7 +617,7 @@ int git_diff__oid_for_entry( } /* calculate OID for file if possible */ - if (S_ISGITLINK(entry.mode)) { + if (S_ISGITLINK(mode)) { git_submodule *sm; if (!git_submodule_lookup(&sm, diff->repo, entry.path)) { @@ -630,7 +631,7 @@ int git_diff__oid_for_entry( */ giterr_clear(); } - } else if (S_ISLNK(entry.mode)) { + } else if (S_ISLNK(mode)) { error = git_odb__hashlink(out, full_path.ptr); diff->perf.oid_calculations++; } else if (!git__is_sizet(entry.file_size)) { @@ -657,11 +658,14 @@ int git_diff__oid_for_entry( /* update index for entry if requested */ if (!error && update_match && git_oid_equal(out, update_match)) { git_index *idx; + git_index_entry updated_entry; - if (!(error = git_repository_index__weakptr(&idx, diff->repo))) { - git_oid_cpy(&entry.id, out); - error = git_index_add(idx, &entry); - } + memcpy(&updated_entry, &entry, sizeof(git_index_entry)); + updated_entry.mode = mode; + git_oid_cpy(&updated_entry.id, out); + + if (!(error = git_repository_index__weakptr(&idx, diff->repo))) + error = git_index_add(idx, &updated_entry); } git_buf_free(&full_path); @@ -856,7 +860,7 @@ static int maybe_modified( &oitem->id : NULL; if ((error = git_diff__oid_for_entry( - &noid, diff, nitem, update_check)) < 0) + &noid, diff, nitem, nmode, update_check)) < 0) return error; /* if oid matches, then mark unmodified (except submodules, where |