From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jan 2018 21:28:09 +0000 (-0800)
Subject: Merge branch 'ew/empty-merge-with-dirty-index'
X-Git-Tag: v2.16.0-rc1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=843d94b3cd30e61c7c4879f9bc6d013021b9350a;p=thirdparty%2Fgit.git

Merge branch 'ew/empty-merge-with-dirty-index'

"git merge -s recursive" did not correctly abort when the index is
dirty, if the merged tree happened to be the same as the current
HEAD, which has been fixed.

* ew/empty-merge-with-dirty-index:
  merge-recursive: avoid incorporating uncommitted changes in a merge
  move index_has_changes() from builtin/am.c to merge.c for reuse
  t6044: recursive can silently incorporate dirty changes in a merge
---

843d94b3cd30e61c7c4879f9bc6d013021b9350a