[PATCH v4 0/2] t3433: new rebase testcase documenting a stat-dirty-like failure

Changes since v3:

 * add another patch which fixes the bug. Thanks to Phillip for doing some
   digging to find the bug wasn't in rebase but in git_merge_trees().

Elijah Newren (2):
  t3433: new rebase testcase documenting a stat-dirty-like failure
  merge-recursive: fix the refresh logic in update_file_flags

 merge-recursive.c                    |  7 ++--
 t/t3433-rebase-across-mode-change.sh | 48 ++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100755 t/t3433-rebase-across-mode-change.sh

base-commit: e68e29171cc2d6968902e0654b5687fbe1ccb903
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-712%2Fnewren%2Fdocument-rebase-failure-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-712/newren/document-rebase-failure-v4
Pull-Request: https://github.com/git/git/pull/712

Range-diff vs v3:

 1:  270591cd3be = 1:  270591cd3be t3433: new rebase testcase documenting a stat-dirty-like failure
 -:  ----------- > 2:  ba297fd67bb merge-recursive: fix the refresh logic in update_file_flags