projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fa62d03 b6825b5)
Merge branch 'ew/empty-merge-with-dirty-index'
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jan 2018 21:28:09 +0000 (13:28 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jan 2018 21:28:09 +0000 (13:28 -0800)
commit843d94b3cd30e61c7c4879f9bc6d013021b9350a
tree8e9700c13e1b66580c1cb729f0274fe6bb5567a9tree | snapshot
parentfa62d0392b6f69e5c2ba0885bd85e670c28e9546commit | diff
parentb6825b5c8e8b58943511f2576475accf1593486ecommit | diff
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
builtin/am.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.