From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Jul 2011 18:43:14 GMT
Subject: Re: [PATCH 30/48] merge-recursive: Fix deletion of untracked file in rename/delete conflicts
Message-ID: <7vaac73265.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1307518278-23814-31-git-send-email-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

> In summary:
>   Change <expression> from "o->call_depth || renamed_stage == 2" to
>   "renamed_stage == 2 || !was_tracked(ren1_src)", in order to
>   remove unnecessary code and avoid deleting untracked files.
>
> 96 lines of explanation in the changelog to describe a one-line fix...

Beautifully written analysis, though ;-)