Re: What's cooking in git.git (Dec 2017, #05; Wed, 27)

From: Elijah Newren <newren@gmail.com>
Date: Dec 28, 2017, 01:09 UTC
Message-ID: <CABPp-BHxcFU+e4OgccWb+LgLbMo5sJsNjYFQb=WnxViTFdOu=g@mail.gmail.com>
In-Reply-To: <xmqq608rn9ca.fsf@gitster.mtv.corp.google.com>

On Wed, Dec 27, 2017 at 1:34 PM, Junio C Hamano <gitster@pobox.com> wrote:

> * ew/empty-merge-with-dirty-index (2017-12-22) 1 commit
>  - Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
>  (this branch uses ew/empty-merge-with-dirty-index-maint.)

<snip>

Show 9 quoted lines

> * ew/empty-merge-with-dirty-index-maint (2017-12-22) 3 commits
>  - 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
>  (this branch is used by 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.

As promised, I looked through both to check for mis-merges or problems in applying to maint. The changes all look good to me. I was surprised by the branch name, though. Was 'ew/' a typo, or does that part of the branch name mean something other than what I always assumed?