Re: [mh] Git woes

I think it may have worked by adding a -n to the commit viz;

git commit -n -m "adding wildcards and LWT to mqtt.pm"

Looking at the pull request it seems to include a lot more than just 
mqtt.pm which is the only file I changed

Giles

On 20/12/2020 16:35, Giles Godart-Brown wrote:
>
> I'm trying to get my contribution into Git for the mqtt wildcards and 
> LWT, but I'm getting a Git error that I cannot seem to solve.
>
> Here is what I did.
>
> git branch mqtt_LWT_wildcards
>
> git checkout mqtt_LWT_wildcards
>
> edit mqtt.pm
>
> git stage mqtt.pm
> git commit
>
> this gives the following error;
>
> bin/githook-perltidy pre-commit:
>     # saving non-indexed changes and tidying
>     git stash save --quiet --keep-index bin/githook-perltidy 
> 2020-12-20T16:30:09
>     git checkout-index -a
> lib/mqtt.pm already exists, no checkout
> git checkout-index -a failed: 32768 at bin/githook-perltidy line 36, 
> <$fh> line 2.
>     main::run('git', 'checkout-index', '-a') called at 
> bin/githook-perltidy line 165
>
> bin/githook-perltidy: pre-commit FAIL! Restoring...
>     git reset --hard
> HEAD is now at e78531f4 Merge pull request #804 from 
> jsiddall/MQTT_table_support
>     git stash pop --quiet --index
>
> I'm a complete novice with Git, so probably ding something wrong, can 
> someone help?
>
> Thanks
>
> Giles
>

________________________________________________________
To unsubscribe from this list, go to: https://lists.sourceforge.net/lists/listinfo/misterhouse-users