diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:23 -0700 |
| commit | 569b89842df4cb1bf09c1a8a29f87cd282b7e123 (patch) | |
| tree | cb4c66ff42070a2afda0f05a9c90c6e9c0c5db18 /commit-graph.c | |
| parent | Merge branch 'en/check-ignore' into maint (diff) | |
| parent | merge-recursive: fix the refresh logic in update_file_flags (diff) | |
| download | git-569b89842df4cb1bf09c1a8a29f87cd282b7e123.tar.gz git-569b89842df4cb1bf09c1a8a29f87cd282b7e123.zip | |
Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
The merge-recursive machinery failed to refresh the cache entry for
a merge result in a couple of places, resulting in an unnecessary
merge failure, which has been fixed.
* en/t3433-rebase-stat-dirty-failure:
merge-recursive: fix the refresh logic in update_file_flags
t3433: new rebase testcase documenting a stat-dirty-like failure
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions