RE: one bug on git

RE: one bug on git

[Lou, Pengfei (NSB - CN/Hangzhou)]

Hello community 
     One problem I found recently within my working, please check my detail below. 

     I tried to run my script (check the attached file 'problem.sh') to build one git repository , it can be successful, but the command "git log -raw -1 ${revision}^ ${revision}" on that repo would generate some  unexpected result,  please check the result below

[pelou@hzling29 try_des]$ git --version
git version 2.6.2

[pelou@hzling29 try_des]$ git log --raw -1 164304f48726d31336e2e130a90e42b7f1c480f8
commit 164304f48726d31336e2e130a90e42b7f1c480f8
Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 14:54:33 2019 +0800

    3

:100644 100644 9a7456b... 8148ef7... M  lpf
[pelou@hzling29 try_des]$ git log --raw -1 164304f48726d31336e2e130a90e42b7f1c480f8^ 164304f48726d31336e2e130a90e42b7f1c480f8
commit dd1a95338ffd471e5b270a487b585bbfcf9926a5
Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 14:54:33 2019 +0800

    2

:100644 100644 d474e1b... 9a7456b... M  lpf 

     Next step I changed my script(check the attached file good.sh) and only add some delays after "git push", everything is normal, check it below
[pelou@hzling29 try_des]$ git log --raw -1 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
commit 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 15:00:45 2019 +0800

    3

:100644 100644 9a7456b... 8148ef7... M  lpf
[pelou@hzling29 try_des]$ git log --raw -1 2027dc54da1896cf1dfa301c3444b1690d6cb1d8^ 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
commit 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 15:00:45 2019 +0800

    3

:100644 100644 9a7456b... 8148ef7... M  lpf

So please help me fix it. Please let me know if I was wrong or miss some thing

Br, Hercules

RE: one bug on git

[Lou, Pengfei (NSB - CN/Hangzhou)]

[-- Attachment #1: Type: text/plain, Size: 1892 bytes --]

Hello community 
     One problem I found recently within my working, please check my detail below. 

     I tried to run my script (check the attached file 'problem.sh') to build one git repository , it can be successful, but the command "git log -raw -1 ${revision}^ ${revision}" on that repo would generate some  unexpected result,  please check the result below

[pelou@hzling29 try_des]$ git --version
git version 2.6.2

[pelou@hzling29 try_des]$ git log --raw -1 164304f48726d31336e2e130a90e42b7f1c480f8
commit 164304f48726d31336e2e130a90e42b7f1c480f8
Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 14:54:33 2019 +0800

    3

:100644 100644 9a7456b... 8148ef7... M  lpf
[pelou@hzling29 try_des]$ git log --raw -1 164304f48726d31336e2e130a90e42b7f1c480f8^ 164304f48726d31336e2e130a90e42b7f1c480f8
commit dd1a95338ffd471e5b270a487b585bbfcf9926a5
Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 14:54:33 2019 +0800

    2

:100644 100644 d474e1b... 9a7456b... M  lpf 

     Next step I changed my script(check the attached file good.sh) and only add some delays after "git push", everything is normal, check it below
[pelou@hzling29 try_des]$ git log --raw -1 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
commit 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 15:00:45 2019 +0800

    3

:100644 100644 9a7456b... 8148ef7... M  lpf
[pelou@hzling29 try_des]$ git log --raw -1 2027dc54da1896cf1dfa301c3444b1690d6cb1d8^ 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
commit 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 15:00:45 2019 +0800

    3

:100644 100644 9a7456b... 8148ef7... M  lpf

So please help me fix it. Please let me know if I was wrong or miss some thing

Br, Hercules

[-- Attachment #2: good.sh --]
[-- Type: application/octet-stream, Size: 717 bytes --]

#!/bin/bash

gitMetaLayer=/var/fpwork/pelou/tmp/FCA_PS_CI_SCM-3695/ci_test/try_src

gitMetaLayer_work=/var/fpwork/pelou/tmp/FCA_PS_CI_SCM-3695/ci_test/try_des

rm -rf ${gitMetaLayer}
rm -rf ${gitMetaLayer_work}

mkdir -p ${gitMetaLayer}
cd ${gitMetaLayer}
git init -q --bare

mkdir -p ${gitMetaLayer_work}
cd ${gitMetaLayer_work}
git clone -q ${gitMetaLayer} ${gitMetaLayer_work}

touch lpf
git add lpf
git commit -a -m "init git repo"


echo -e "1\n" > lpf
git commit -a -m "1"
sleep 1

echo -e "2\n" > lpf
git commit -a -m "2"
sleep 1

echo -e "3\n" > lpf
git commit -a -m "3"
sleep 1

echo -e "4\n" > lpf
git commit -a -m "4"
sleep 1

echo -e "5\n" > lpf
git commit -a -m "5"

[-- Attachment #3: problem.sh --]
[-- Type: application/octet-stream, Size: 721 bytes --]

#!/bin/bash

gitMetaLayer=/var/fpwork/pelou/tmp/FCA_PS_CI_SCM-3695/ci_test/try_src

gitMetaLayer_work=/var/fpwork/pelou/tmp/FCA_PS_CI_SCM-3695/ci_test/try_des

rm -rf ${gitMetaLayer}
rm -rf ${gitMetaLayer_work}

mkdir -p ${gitMetaLayer}
cd ${gitMetaLayer}
git init -q --bare

mkdir -p ${gitMetaLayer_work}
cd ${gitMetaLayer_work}
git clone -q ${gitMetaLayer} ${gitMetaLayer_work}

touch lpf
git add lpf
git commit -a -m "init git repo"


echo -e "1\n" > lpf
git commit -a -m "1"
#sleep 1

echo -e "2\n" > lpf
git commit -a -m "2"
#sleep 1

echo -e "3\n" > lpf
git commit -a -m "3"
#sleep 1

echo -e "4\n" > lpf
git commit -a -m "4"
#sleep 1

echo -e "5\n" > lpf
git commit -a -m "5"

Re: one bug on git

[Bryan Turner]

On Tue, Dec 3, 2019 at 12:29 AM Lou, Pengfei (NSB - CN/Hangzhou)
<pengfei.lou@nokia-sbell.com> wrote:
>
> Hello community
>      One problem I found recently within my working, please check my detail below.
>
>      I tried to run my script (check the attached file 'problem.sh') to build one git repository , it can be successful, but the command "git log -raw -1 ${revision}^ ${revision}" on that repo would generate some  unexpected result,  please check the result below
>
> [pelou@hzling29 try_des]$ git --version
> git version 2.6.2
>
> [pelou@hzling29 try_des]$ git log --raw -1 164304f48726d31336e2e130a90e42b7f1c480f8
> commit 164304f48726d31336e2e130a90e42b7f1c480f8
> Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 14:54:33 2019 +0800
>
>     3
>
> :100644 100644 9a7456b... 8148ef7... M  lpf
> [pelou@hzling29 try_des]$ git log --raw -1 164304f48726d31336e2e130a90e42b7f1c480f8^ 164304f48726d31336e2e130a90e42b7f1c480f8
> commit dd1a95338ffd471e5b270a487b585bbfcf9926a5
> Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 14:54:33 2019 +0800
>
>     2
>
> :100644 100644 d474e1b... 9a7456b... M  lpf
>
>      Next step I changed my script(check the attached file good.sh) and only add some delays after "git push", everything is normal, check it below
> [pelou@hzling29 try_des]$ git log --raw -1 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
> commit 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
> Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 15:00:45 2019 +0800
>
>     3
>
> :100644 100644 9a7456b... 8148ef7... M  lpf
> [pelou@hzling29 try_des]$ git log --raw -1 2027dc54da1896cf1dfa301c3444b1690d6cb1d8^ 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
> commit 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
> Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 15:00:45 2019 +0800
>
>     3
>
> :100644 100644 9a7456b... 8148ef7... M  lpf
>
> So please help me fix it. Please let me know if I was wrong or miss some thing

By default, git log sorts commits by their timestamps and outputs them
in reverse chronological order (as stated in the git log
documentation[1]), not the order you requested the commits in. Without
the delays, the commits can happen so fast you end up with identical
timestamps on each commit. I'm not sure git log has a tie-breaker in
such a case (it may just end up being input order).

If you want the commits to be output in the order you ask for them in,
you might try something like "git log --raw --no-walk=unsorted sha^
sha". This will output exactly the commits you ask for (so "sha"'s
first parent and "sha") in the same order you requested them in.

Hope this helps,
Bryan Turner

[1] https://git-scm.com/docs/git-log#_commit_ordering

>
> Br, Hercules

RE: one bug on git

[Lou, Pengfei (NSB - CN/Hangzhou)]

Hi
   Thanks for your support
 
    But your idea was still not working as my wanted , please check the result below

[pelou@hzling29 try_des]$ git log -1 --raw --no-walk=unsorted 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^ 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
commit 9d00cc608993840e24f65c7b79ae10f85c2d72ff
Author: pelou <pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 17:00:47 2019 +0800

    2

:100644 100644 d474e1b... 9a7456b... M  lpf
[pelou@hzling29 try_des]$ git log --raw --no-walk=unsorted 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^ 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
commit 9d00cc608993840e24f65c7b79ae10f85c2d72ff
Author: pelou <pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 17:00:47 2019 +0800

    2

:100644 100644 d474e1b... 9a7456b... M  lpf

commit 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
Author: pelou <pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 17:00:47 2019 +0800

    3

So you mean it is not one bug /issue, and  adding delay was mandatory for this case? Actually , I found it was still be failure if the delay was set 0.5 seconds. 

tks
Br, Hercules

-----Original Message-----
From: Bryan Turner <bturner@atlassian.com> 
Sent: 2019年12月3日 16:56
To: Lou, Pengfei (NSB - CN/Hangzhou) <pengfei.lou@nokia-sbell.com>
Cc: git@vger.kernel.org
Subject: Re: one bug on git

On Tue, Dec 3, 2019 at 12:29 AM Lou, Pengfei (NSB - CN/Hangzhou) <pengfei.lou@nokia-sbell.com> wrote:
>
> Hello community
>      One problem I found recently within my working, please check my detail below.
>
>      I tried to run my script (check the attached file 'problem.sh') 
> to build one git repository , it can be successful, but the command 
> "git log -raw -1 ${revision}^ ${revision}" on that repo would generate 
> some  unexpected result,  please check the result below
>
> [pelou@hzling29 try_des]$ git --version git version 2.6.2
>
> [pelou@hzling29 try_des]$ git log --raw -1 
> 164304f48726d31336e2e130a90e42b7f1c480f8
> commit 164304f48726d31336e2e130a90e42b7f1c480f8
> Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 14:54:33 2019 +0800
>
>     3
>
> :100644 100644 9a7456b... 8148ef7... M  lpf
> [pelou@hzling29 try_des]$ git log --raw -1 
> 164304f48726d31336e2e130a90e42b7f1c480f8^ 
> 164304f48726d31336e2e130a90e42b7f1c480f8
> commit dd1a95338ffd471e5b270a487b585bbfcf9926a5
> Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 14:54:33 2019 +0800
>
>     2
>
> :100644 100644 d474e1b... 9a7456b... M  lpf
>
>      Next step I changed my script(check the attached file good.sh) 
> and only add some delays after "git push", everything is normal, check 
> it below
> [pelou@hzling29 try_des]$ git log --raw -1 
> 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
> commit 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
> Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 15:00:45 2019 +0800
>
>     3
>
> :100644 100644 9a7456b... 8148ef7... M  lpf
> [pelou@hzling29 try_des]$ git log --raw -1 
> 2027dc54da1896cf1dfa301c3444b1690d6cb1d8^ 
> 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
> commit 2027dc54da1896cf1dfa301c3444b1690d6cb1d8
> Author: pelou <mailto:pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 15:00:45 2019 +0800
>
>     3
>
> :100644 100644 9a7456b... 8148ef7... M  lpf
>
> So please help me fix it. Please let me know if I was wrong or miss 
> some thing

By default, git log sorts commits by their timestamps and outputs them in reverse chronological order (as stated in the git log documentation[1]), not the order you requested the commits in. Without the delays, the commits can happen so fast you end up with identical timestamps on each commit. I'm not sure git log has a tie-breaker in such a case (it may just end up being input order).

If you want the commits to be output in the order you ask for them in, you might try something like "git log --raw --no-walk=unsorted sha^ sha". This will output exactly the commits you ask for (so "sha"'s first parent and "sha") in the same order you requested them in.

Hope this helps,
Bryan Turner

[1] https://git-scm.com/docs/git-log#_commit_ordering

>
> Br, Hercules

Re: one bug on git

[Bryan Turner]

On Tue, Dec 3, 2019 at 1:08 AM Lou, Pengfei (NSB - CN/Hangzhou)
<pengfei.lou@nokia-sbell.com> wrote:
>
> Hi
>    Thanks for your support
>
>     But your idea was still not working as my wanted , please check the result below
>
> [pelou@hzling29 try_des]$ git log -1 --raw --no-walk=unsorted 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^ 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
> commit 9d00cc608993840e24f65c7b79ae10f85c2d72ff
> Author: pelou <pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 17:00:47 2019 +0800
>
>     2
>
> :100644 100644 d474e1b... 9a7456b... M  lpf
> [pelou@hzling29 try_des]$ git log --raw --no-walk=unsorted 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^ 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
> commit 9d00cc608993840e24f65c7b79ae10f85c2d72ff
> Author: pelou <pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 17:00:47 2019 +0800
>
>     2
>
> :100644 100644 d474e1b... 9a7456b... M  lpf
>
> commit 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
> Author: pelou <pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 17:00:47 2019 +0800
>
>     3

At this point I'm not sure what you're looking for. Your first command
has -1 on it, so it only prints the commit for
57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^, which is
9d00cc608993840e24f65c7b79ae10f85c2d72ff. Your second command omits
the -1 and so it prints both 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^
(9d00cc608993840e24f65c7b79ae10f85c2d72ff) and
57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15--in the order you asked for
them.

What output are you _expecting_ to see?

>
> So you mean it is not one bug /issue, and  adding delay was mandatory for this case? Actually , I found it was still be failure if the delay was set 0.5 seconds.

git commit records timestamps with second precision, so a delay of
half a second means you can still have 2 commits recorded with
identical _to the second_ timestamps.

Bryan

>
> tks
> Br, Hercules

P.S. Please don't top-post on the list. Respond inline adjacent to the
part of the message you're talking about.

RE: one bug on git

[Lou, Pengfei (NSB - CN/Hangzhou)]

I think it should be like below
[pelou@hzling29 try_des]$ git log --raw -1 --no-walk=unsorted 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^ 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
commit 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
Author: pelou <pengfei.lou@nokia-sbell.com>
Date:   Tue Dec 3 17:00:47 2019 +0800

    3

:100644 100644 9a7456b... 8148ef7... M  lpf

Br, Hercules
-----Original Message-----
From: Bryan Turner <bturner@atlassian.com> 
Sent: 2019年12月3日 17:22
To: Lou, Pengfei (NSB - CN/Hangzhou) <pengfei.lou@nokia-sbell.com>
Cc: git@vger.kernel.org
Subject: Re: one bug on git

On Tue, Dec 3, 2019 at 1:08 AM Lou, Pengfei (NSB - CN/Hangzhou) <pengfei.lou@nokia-sbell.com> wrote:
>
> Hi
>    Thanks for your support
>
>     But your idea was still not working as my wanted , please check 
> the result below
>
> [pelou@hzling29 try_des]$ git log -1 --raw --no-walk=unsorted 
> 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^ 
> 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
> commit 9d00cc608993840e24f65c7b79ae10f85c2d72ff
> Author: pelou <pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 17:00:47 2019 +0800
>
>     2
>
> :100644 100644 d474e1b... 9a7456b... M  lpf
> [pelou@hzling29 try_des]$ git log --raw --no-walk=unsorted 
> 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^ 
> 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
> commit 9d00cc608993840e24f65c7b79ae10f85c2d72ff
> Author: pelou <pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 17:00:47 2019 +0800
>
>     2
>
> :100644 100644 d474e1b... 9a7456b... M  lpf
>
> commit 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
> Author: pelou <pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 17:00:47 2019 +0800
>
>     3

At this point I'm not sure what you're looking for. Your first command has -1 on it, so it only prints the commit for 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^, which is 9d00cc608993840e24f65c7b79ae10f85c2d72ff. Your second command omits the -1 and so it prints both 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^
(9d00cc608993840e24f65c7b79ae10f85c2d72ff) and 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15--in the order you asked for them.

What output are you _expecting_ to see?

>
> So you mean it is not one bug /issue, and  adding delay was mandatory for this case? Actually , I found it was still be failure if the delay was set 0.5 seconds.

git commit records timestamps with second precision, so a delay of half a second means you can still have 2 commits recorded with identical _to the second_ timestamps.

Bryan

>
> tks
> Br, Hercules

P.S. Please don't top-post on the list. Respond inline adjacent to the part of the message you're talking about.

Re: one bug on git

[Bryan Turner]

> On Tue, Dec 3, 2019 at 1:25 AM Lou, Pengfei (NSB - CN/Hangzhou) <pengfei.lou@nokia-sbell.com> wrote:
>
> I think it should be like below
> [pelou@hzling29 try_des]$ git log --raw -1 --no-walk=unsorted 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^ 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
> commit 57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15
> Author: pelou <pengfei.lou@nokia-sbell.com>
> Date:   Tue Dec 3 17:00:47 2019 +0800
>
>     3
>
> :100644 100644 9a7456b... 8148ef7... M  lpf

So you always want to see the child before the parent?

Try " git log --raw -1 --date-order
57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15^
57cf56b8c1af9115a7f8e1c1c8f07e4d657e8b15"

(Replacing --no-walk=unsorted with --date-order)

Bryan

P.S. Again, please don't top-post on the list.