From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (Dec 2017, #05; Wed, 27)
Date: Wed, 27 Dec 2017 17:09:34 -0800 [thread overview]
Message-ID: <CABPp-BHxcFU+e4OgccWb+LgLbMo5sJsNjYFQb=WnxViTFdOu=g@mail.gmail.com> (raw)
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>
> * 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?
next prev parent reply other threads:[~2017-12-28 1:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-27 21:34 What's cooking in git.git (Dec 2017, #05; Wed, 27) Junio C Hamano
2017-12-28 1:09 ` Elijah Newren [this message]
2017-12-28 19:02 ` Junio C Hamano
2018-01-02 20:04 ` Stefan Beller
2018-01-02 22:19 ` Jonathan Nieder
2018-01-03 9:26 ` Daniel Knittl-Frank
2018-01-03 9:57 ` Kaartic Sivaraam
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABPp-BHxcFU+e4OgccWb+LgLbMo5sJsNjYFQb=WnxViTFdOu=g@mail.gmail.com' \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).