From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Mar 2020 22:02:23 +0000 (-0700)
Subject: Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
X-Git-Tag: v2.25.2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=569b89842df4cb1bf09c1a8a29f87cd282b7e123;p=thirdparty%2Fgit.git

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
---

569b89842df4cb1bf09c1a8a29f87cd282b7e123