diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-06-09 18:36:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-09 18:36:21 +0100 |
| commit | 795a5b28ad1f6e5dfd82d45bd7721914f49d31d3 (patch) | |
| tree | 350786a9984128dea7e18fbfd41a8bb7e56e55b0 /src | |
| parent | f81923efbeab1290e7a069446f62f9794cf6d408 (diff) | |
| parent | 5a7d454bf657fdf4d726f2319bf554ffd4486ed3 (diff) | |
| download | libgit2-795a5b28ad1f6e5dfd82d45bd7721914f49d31d3.tar.gz | |
Merge pull request #4668 from novalis/bad-stash
Fix stash save bug with fast path index check
Diffstat (limited to 'src')
| -rw-r--r-- | src/diff_generate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/diff_generate.c b/src/diff_generate.c index e11cbe4e4..0105c1701 100644 --- a/src/diff_generate.c +++ b/src/diff_generate.c @@ -273,7 +273,8 @@ static git_diff_delta *diff_delta__last_for_item( break; case GIT_DELTA_MODIFIED: if (git_oid__cmp(&delta->old_file.id, &item->id) == 0 || - git_oid__cmp(&delta->new_file.id, &item->id) == 0) + (delta->new_file.mode == item->mode && + git_oid__cmp(&delta->new_file.id, &item->id) == 0)) return delta; break; default: |