From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Mar 2020 23:07:19 +0000 (-0800)
Subject: Merge branch 'en/t3433-rebase-stat-dirty-failure'
X-Git-Tag: v2.26.0-rc0~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48d5f25ddd9812fc78632357d062894342dc55df;p=thirdparty%2Fgit.git

Merge branch 'en/t3433-rebase-stat-dirty-failure'

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

48d5f25ddd9812fc78632357d062894342dc55df