Tiny Tiny RSS: Community

Trouble updating via git, files aren't changed but won't pull


#1

Describe the problem you’re having:

Trying to update via git pull, but git thinks something is changed in my local copy in the languages, but it isn’t. Even checking out the file again doesn’t fix it. I’m not a power-git user, but I’ve tried several things to no avail.

If possible include steps to reproduce the problem:

Try to update:

    [email protected]:/path/tt-rss$ git pull
    error: Your local changes to the following files would be overwritten by merge:
    	locale/pl_PL/LC_MESSAGES/messages.mo
    Please commit your changes or stash them before you merge.
    Aborting

Try to revert any possible changes to the affected file (there are none):

    [email protected]:/path/tt-rss$ git checkout -- locale/pl_PL/LC_MESSAGES/messages.mo

Try to update again:

    [email protected]:/path/tt-rss$ git pull
    error: Your local changes to the following files would be overwritten by merge:
    	locale/pl_PL/LC_MESSAGES/messages.mo
    Please commit your changes or stash them before you merge.
    Aborting

tt-rss version (including git commit id):

Last successful commit pulled is 26a89ab6cb48e614a022aa65fefe62a8c9c71899

Platform (i.e. Linux distro, PHP, PostgreSQL, etc) versions:

Windows 2008 R2, PHP 5.6, MySQL 5.6

Please provide any additional information below:

Git pulls have worked flawlessly for years up to this point. I do all the git work from MacOS, mounting the volumes on my server.

(Edited for code formatting)


#2

You could try:

git checkout -- .

It does the same thing but with every file instead of just the one in question. You can also try:

git reset HEAD --hard

Which I think is supposed to do the same thing.

You may want to run git diff to see what the actual difference is. I’ve had this issue when file permissions are not properly being set across an SMB share (the executable bit).

e: See this Stack Overflow answer:

The -c flag can be used to set this option for one-off commands:

git -c core.fileMode=false diff


#3

Using

git checkout -- .

and

git reset HEAD --hard

didn’t make any difference.

git diff

only shows the small patch I made to rssutils.php, which I have discarded for now.

fileMode as already set to false. Still cannot do a pull. :-/


#4

Okay, I was able to update finally by using the Windows git client (TortoiseGit) which showed the following:

git.exe pull --progress -v --no-rebase "origin"

From https://git.tt-rss.org/git/tt-rss
= [up to date]        master               -> origin/master
= [up to date]        js-strict-mode       -> origin/js-strict-mode
= [up to date]        jsonfeed-test-branch -> origin/jsonfeed-test-branch
= [up to date]        pdo-experimental     -> origin/pdo-experimental
Merge made by the 'recursive' strategy.
locale/ar_SA/LC_MESSAGES/messages.mo               | Bin 65799 -> 65259 bytes
locale/ar_SA/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/bg_BG/LC_MESSAGES/messages.mo               | Bin 74842 -> 74280 bytes
locale/bg_BG/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/ca_CA/LC_MESSAGES/messages.mo               | Bin 21227 -> 20891 bytes
locale/ca_CA/LC_MESSAGES/messages.po               | 851 +++++++++----------
locale/cs_CZ/LC_MESSAGES/messages.mo               | Bin 56932 -> 56518 bytes
locale/cs_CZ/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/da_DK/LC_MESSAGES/messages.mo               | Bin 25997 -> 25893 bytes
locale/da_DK/LC_MESSAGES/messages.po               | 839 +++++++++----------
locale/de_DE/LC_MESSAGES/messages.mo               | Bin 62328 -> 61935 bytes
locale/de_DE/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/el_GR/LC_MESSAGES/messages.mo               | Bin 35771 -> 35666 bytes
locale/el_GR/LC_MESSAGES/messages.po               | 839 +++++++++----------
locale/es_ES/LC_MESSAGES/messages.mo               | Bin 56872 -> 56438 bytes
locale/es_ES/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/es_LA/LC_MESSAGES/messages.mo               | Bin 27741 -> 27672 bytes
locale/es_LA/LC_MESSAGES/messages.po               | 839 +++++++++----------
locale/fi_FI/LC_MESSAGES/messages.mo               | Bin 47863 -> 47439 bytes
locale/fi_FI/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/fr_FR/LC_MESSAGES/messages.mo               | Bin 61094 -> 60665 bytes
locale/fr_FR/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/hu_HU/LC_MESSAGES/messages.mo               | Bin 56299 -> 55851 bytes
locale/hu_HU/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/it_IT/LC_MESSAGES/messages.mo               | Bin 62006 -> 61552 bytes
locale/it_IT/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/ja_JP/LC_MESSAGES/messages.mo               | Bin 59069 -> 58572 bytes
locale/ja_JP/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/ko_KR/LC_MESSAGES/messages.mo               | Bin 40155 -> 39742 bytes
locale/ko_KR/LC_MESSAGES/messages.po               | 848 +++++++++----------
locale/lv_LV/LC_MESSAGES/messages.mo               | Bin 54145 -> 53750 bytes
locale/lv_LV/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/nb_NO/LC_MESSAGES/messages.mo               | Bin 20039 -> 19694 bytes
locale/nb_NO/LC_MESSAGES/messages.po               | 850 +++++++++----------
locale/nl_NL/LC_MESSAGES/messages.mo               | Bin 51599 -> 51203 bytes
locale/nl_NL/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/pl_PL/LC_MESSAGES/messages.mo               | Bin 55669 -> 55254 bytes
locale/pl_PL/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/pt_BR/LC_MESSAGES/messages.mo               | Bin 61470 -> 62076 bytes
locale/pt_BR/LC_MESSAGES/messages.po               | 912 ++++++++++-----------
locale/pt_PT/LC_MESSAGES/messages.mo               | Bin 50199 -> 49801 bytes
locale/pt_PT/LC_MESSAGES/messages.po               | 849 +++++++++----------
locale/ru_RU/LC_MESSAGES/messages.mo               | Bin 71850 -> 71328 bytes
locale/ru_RU/LC_MESSAGES/messages.po               | 848 +++++++++----------
locale/sv_SE/LC_MESSAGES/messages.mo               | Bin 50109 -> 49695 bytes
locale/sv_SE/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/tr_TR/LC_MESSAGES/messages.mo               | Bin 52927 -> 52520 bytes
locale/tr_TR/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/zh_CN/LC_MESSAGES/messages.mo               | Bin 36686 -> 36293 bytes
locale/zh_CN/LC_MESSAGES/messages.po               | 845 +++++++++----------
locale/zh_TW/LC_MESSAGES/messages.mo               | Bin 36167 -> 35772 bytes
locale/zh_TW/LC_MESSAGES/messages.po               | 845 +++++++++----------
messages.pot                                       | 708 ++++++++--------
plugins/af_comics/filters/af_comics_comicpress.php |   3 +-
54 files changed, 11462 insertions(+), 11289 deletions(-)
mode change 100644 => 100755 plugins/af_comics/filters/af_comics_comicpress.php

Success (35656 ms @ 5/11/2018 1:58:05 PM)

Dunno why git on my Mac (v2.14.3) was unable to pull.


#5

Sounds like a git problem not a TTRSS problem, why don’t you take it up on a Git support forum then.

Have you tried just starting from scratch on the Mac, move everything to a new folder and doing a fresh install from git?
Also is there anything like security/AV causing interference, maybe they don’t like something in the file so are blocking it from being accessed.