projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 16a4bf1 fb1c18f)
Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:23 +0000 (15:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:23 +0000 (15:02 -0700)
commit569b89842df4cb1bf09c1a8a29f87cd282b7e123
treecb4c66ff42070a2afda0f05a9c90c6e9c0c5db18tree | snapshot
parent16a4bf10359edf34a7c62d6466dab2e33060d332commit | diff
parentfb1c18fc466c6a9c6ea1b072c9db93c0046f4cbdcommit | diff
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
merge-recursive.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.