Re: [PATCH 30/48] merge-recursive: Fix deletion of untracked file in rename/delete conflicts

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Elijah Newren <newren@xxxxxxxxx> 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 ;-)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]