maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michael Osipov <micha...@apache.org>
Subject Re: Git Commit log with wrong encoding
Date Sat, 06 Aug 2016 18:38:15 GMT
Am 2016-08-06 um 20:35 schrieb Karl Heinz Marbaise:
> On 8/6/16 8:29 PM, Michael Osipov wrote:
>> Am 2016-08-06 um 20:24 schrieb Karl Heinz Marbaise:
>>> Hi Michael,
>>>
>>> On 8/6/16 8:20 PM, Michael Osipov wrote:
>>>> Am 2016-08-06 um 20:01 schrieb Karl Heinz Marbaise:
>>>>> Hi Michael,
>>>>>
>>>>> On 8/6/16 7:46 PM, Michael Osipov wrote:
>>>>>> Am 2016-08-06 um 19:38 schrieb Karl Heinz Marbaise:
>>>>>>> Hi,
>>>>>>>
>>>>>>> I have accidently committed a change in Git with a log message
which
>>>>>>> contains wrongly encoded characters...
>>>>>>>
>>>>>>> What is the best to handle this?
>>>>>>>
>>>>>>> git commit --amend ..
>>>>>>>
>>>>>>> and
>>>>>>>
>>>>>>> git push -f
>>>>>>
>>>>>> The ASF server will probably block history rewrite.
>>>>>>
>>>>>
>>>>> It works...So I have fixed the wrong encoding log message..
>>>>
>>>> You were lucky because no one pulled yet from and if someone did and
>>>> pushed again, that would be a pain.
>>> I know about the risks I took...;-(...
>>>
>>> But would be the "better" way to fix such issue ?  Do you know a better
>>> one?
>>
>> From the top of my head, I would create an empty commit with a fixed
>> message refencing the SHA1 which was fixed.
>
> But doesn't this kept the commit with the wrong encoded message or do i
> misunderstand a thing ?

Correct but you don't rewrite history and don't mess up other people's 
cloned repo.

See for details: http://stackoverflow.com/q/1491001/696632


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Mime
View raw message