[Python-Dev] Confused on git commit tree about Lib/datetime.py

[Chris Angelico]

On Wed, Aug 1, 2018 at 1:16 PM, Jeffrey Zhang <zhang.lei.fly at gmail.com> wrote:
> I found a interesting issue when checking the Lib/datetime.py implementation
> in python3
>
> This patch is introduced by cf86e368ebd17e10f68306ebad314eea31daaa1e [0].
> But if you
> check the github page[0], or using git tag --contains, you will find v2.7.x
> includes this commit too.
>
> $ git tag --contains cf86e368ebd17e10f68306ebad314eea31daaa1e
> 3.2
> v2.7.10
> v2.7.10rc1
> v2.7.11
> v2.7.11rc1
> ...
>
> whereas, if you check the v2.7.x code base, nothing is found
>
> $ git log v2.7.4 -- Lib/datetime.py
> <nothing here>
>
> I guess it maybe a git tool bug, or the commit tree is messed up. Is there
> any guys could explain this
> situation?

I suppose you could say that the commit tree is "messed up", in a
sense, but it's not truly messed up, just a little odd. It's a
consequence of the way merges have been done in the CPython
repository. Nothing is actually broken, except for the ability to
track down a commit the way you're doing.

ChrisA