Re: gnulib overrides git-log-fix upon upgrade?

[Sami Kerola]

On 19 April 2014 01:15, Pádraig Brady <address@hidden> wrote:
> On 04/19/2014 01:07 AM, Assaf Gordon wrote:
>> But wait...  just to verify before pushing this...
>>
>> On 04/18/2014 07:59 PM, Pádraig Brady wrote:
>>> On 04/18/2014 11:06 PM, Assaf Gordon wrote:
>>>>
>>>> A recent change added a stub "git-log-fix" file to gnulib:
>>>> http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=ce457d622d947d8aa3e325d98a2818d097e7fec9
>>>>
>>>  Good point!
>>>
>>> Attached is a gnulib patch to revert the recent changes,
>>> and a GNU hello patch to improve the gen_Changelog target
>>> to make git-log-fix optional.
>>>
>>
>> This commit (which added "git-fix-log") was done because of an error
>> another user reported, where a non-existing 'git-log-fix' caused a problem:
>> http://lists.gnu.org/archive/html/bug-tar/2014-03/msg00082.html
>
> right, but removing both recent changes should avoid this error
>
>> So perhaps creating 'git-fix-log' is still needed?
>>
>> And before that, the change happened because of a different
>> issue:
>> http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commit;h=1589a8ab49dc714198d1003f745fe9c9fd5c3256
>>
>> (which I reported, so I'm sorry for all this mess to begin with...)
>>
>> There seems to be some delicate interplay here...
>
> The gnu hello patch should handle this case on bsd also I'm guessing

Pádraig, thank you for sending the change. It looked good to me so it
is pushed to GNU Hello upstream.

http://git.savannah.gnu.org/cgit/hello.git/commit/?id=2ba68ee5a514c3e9d378f256abd2ff40393a4990

I also update gnulib, and added an example how to use git-log-fix file.

FYI I first missed the patch attachment, so the GNU Hello git now has
an example how to revert changes in savannah git. If something like
this happen.

$ git push origin
Enter passphrase for key '/home/kerolasa/.ssh/gnu':
To address@hidden:/srv/git/hello.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'address@hidden:/srv/git/hello.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

the easiest way to get rid of the unintended patch seems to be

$ git revert <commit-id>
[rework]
$ git push origin

Please notice that no matter how hard I tried to push with force the
savannah did not accept history overwrite. And I did not want to be
too brave, and push using --mirror option.

-- 
Sami Kerola
http://www.iki.fi/kerolasa/