git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8c22bd9 fb1c18f)
Merge branch 'en/t3433-rebase-stat-dirty-failure'
authorJunio C Hamano <redacted>
Mon, 2 Mar 2020 23:07:19 +0000 (15:07 -0800)
committerJunio C Hamano <redacted>
Mon, 2 Mar 2020 23:07:19 +0000 (15:07 -0800)
commit48d5f25ddd9812fc78632357d062894342dc55df
tree7ad506259d202b1c8e7f18fb29dcd667792a1c9atree | snapshot
parent8c22bd9ff9d4a355d3546181698307a797fd2bd2commit | diff
parentfb1c18fc466c6a9c6ea1b072c9db93c0046f4cbdcommit | diff
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
merge-recursive.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT