git - Cannot get rid of "Changes to be committed" message even after commit/push

Question

I'm keep getting Changes to be committed message from git status command even after committed and pushed to origin. I can see the changes on origin/master. How can I get rid of this message?

$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

    modified:  foo.php

$ git commit -m 'message' foo.php
On branch master
Your branch is up to date with 'origin/master'.

nothing added to commit

EDIT

Actually, foo.php was a different name say foo-org.php before and I renamed it with:

git mv foo-org.php foo.php

I run git add foo.php then git commit -m 'renamed' foo.php then git push orign master. I can see the file on online repo (origin/master) is up to date, so I have no idea why it is still saying "Changes to be committed".

question from:https://stackoverflow.com/questions/65626614/cannot-get-rid-of-changes-to-be-committed-message-even-after-commit-push

Answer 1

Since the remote master branch is up-to-date, try and reset your local branch to it:

git fetch
git switch -C master origin/master

Or, if you are already locally on master:

git reset --hard origin/master

Check then if the git status still report a non-empty index.