[Qgis-developer] forced update on the repo?

[Radim Blazek]

On Mon, Jan 13, 2014 at 3:24 PM, Matthias Kuhn <matthias.kuhn at gmx.ch> wrote:
> From my understanding: the problem to solve is rather cosmetic?
>
> If yes, -1 to execute this unless there is an option which does not change
> checksums.

I am not sure, maybe better, "git log --topo-order" should always give
correct order but after a while we will forget about messed dates and
reading log may become confusing.

Commit checksums are calculated from commit metadata including date.

Anyway, the correct command to fix it should be:

git filter-branch --env-filter '
  if [ $GIT_COMMIT = "b4d082f97d82140c55a9b0afee5db06227b9c6b3" ];  then
    export GIT_AUTHOR_DATE="1389504120 +1100";
    export GIT_COMMITTER_DATE="1389504120 +1100";
  fi;
  if [ $GIT_COMMIT = "860e23afc70b804b7ddc3f2e98f88e7ee5ac995b" ]; then
    export GIT_AUTHOR_DATE="1389504060 +1100";
    export GIT_COMMITTER_DATE="1389504060 +1100";
  fi' 224e34010aa..HEAD

Radim

> Matthias
>
>
> On Mon 13 Jan 2014 03:17:41 PM CET, Radim Blazek wrote:
>>
>> Wait a moment the date is wrong as you probably noticed, I have messed
>> month with day. I'll post new version soon.
>>
>> Radim
>>
>> On Mon, Jan 13, 2014 at 3:10 PM, Radim Blazek <radim.blazek at gmail.com>
>> wrote:
>>>
>>> On Mon, Jan 13, 2014 at 12:59 PM, Nyall Dawson <nyall.dawson at gmail.com>
>>> wrote:
>>>>
>>>> On 13 January 2014 22:26, Radim Blazek <radim.blazek at gmail.com> wrote:
>>>>>
>>>>> Could it be that b4d082f9 and 860e23afc7 have wrong date Jan 12 2013?
>>>>> The 860e23afc7 has parent 0c6d9ef90 with Jan 12 2014.
>>>>
>>>>
>>>> Arghh... you're right. <hangs head in shame> Is there anyway this can
>>>> be fixed now? My apologies for the inconvenience this has caused...
>>>
>>>
>>> No problem.
>>>
>>> It seems to be fixed by:
>>>
>>> git filter-branch --env-filter 'if [ $GIT_COMMIT =
>>> "b4d082f97d82140c55a9b0afee5db06227b9c6b3" ]; then export
>>> GIT_AUTHOR_DATE="1417450920+1100"; export
>>> GIT_COMMITTER_DATE="1417450920+1100"; fi; if [ $GIT_COMMIT =
>>> "860e23afc70b804b7ddc3f2e98f88e7ee5ac995b" ]; then export
>>> GIT_AUTHOR_DATE="1417450860+1100"; export
>>> GIT_COMMITTER_DATE="1417450860+1100"; fi' 224e34010aa..HEAD
>>>
>>> Note that checksums of those two commits and all following commits will
>>> change.
>>>
>>> Then you need to be courageous enough to run the very dangerous git
>>> push -f. I am not. Please verify everything 10 times before push.
>>>
>>> Could please someone third try to run the command above and confirm
>>> that it corrects the dates and does not do any damage and can be
>>> followed by git push --force?
>>>
>>> I am not git expert.
>>>
>>> Until we fix that, please do not commit to GitHub and preferably do
>>> not comment commits after the problematic commits because checksums
>>> will change.
>>>
>>> Radim
>>
>> _______________________________________________
>>
>> Qgis-developer mailing list
>> Qgis-developer at lists.osgeo.org
>> http://lists.osgeo.org/mailman/listinfo/qgis-developer
>
>
>