1

I have removed some files (a.py and b.py) from project and committed my changes. My teammate pulled changes and program exited with errors.

After some research we have found problem: Git removed a.py and b.py files, but compiled .pyc files remained and caused problems - program used old sources and get an errors.

.pyc files ignored in .gitignore.

What is the best solution to solve such problem?

UPDATE: I know how to ignore files - question not about it. Question is how to avoid situations described above?

malhar
  • 562
  • 1
  • 9
  • 21
A. Innokentiev
  • 681
  • 2
  • 11
  • 27
  • Possible duplicate of [How can I Remove .DS\_Store files from a Git repository?](http://stackoverflow.com/questions/107701/how-can-i-remove-ds-store-files-from-a-git-repository) – agconti Mar 29 '16 at 12:36
  • @agconti it doesn't seem to relate to that question in any way. The `.pyc` files are probably just local not stored in git at all. – Duncan Mar 29 '16 at 12:42
  • 2
    You can have scripts that are executed after pulls. See [this](http://stackoverflow.com/questions/1504724/automatically-remove-pyc-files-and-otherwise-empty-directories-when-i-check-ou) for example. – Schore Mar 29 '16 at 12:45

5 Answers5

2

Python only recompiles the .pyc files when the .py files are newer. This can be a problem in projects with multiple users if your version control uses the date of the original edit rather than the date when changes were last pulled.

Simply put, if you have multiple developers on a project be prepared to occasionally delete .pyc files manually:

find . -name "*.pyc" -delete

will do the job on Linux.

As pointed out in the comments you can include that in post-merge or post-checkout hooks so it runs automatically.

Duncan
  • 92,073
  • 11
  • 122
  • 156
  • 3
    You could put that into a [post-merge hook](https://git-scm.com/book/uz/v2/Customizing-Git-Git-Hooks) to execute automatically after every merge. – syntonym Mar 29 '16 at 12:44
2

You will simply have to go through and delete the .pyc files. The python interpreter is such that the .pyc files are always used unless the .py files are newer (in which case it recompiles the .pyc file).

A good solution is to include a cleaning step in your workflow that removes all .pyc files before running the program:

find . -name "*.pyc" -delete
T0xicCode
  • 4,583
  • 2
  • 37
  • 50
0

Add this post-checkout script in .git/hooks/post-checkout:

git diff --name-status $1 $2 -- '*.py' | grep ^D | sed 's/py$/pyc/' | xargs rm -vf

Translated: Take .py files that were deleted by the checkout, and remove (delete) their corresponding pyc files.

Amichai Schreiber
  • 1,528
  • 16
  • 16
-1

try this:

git rm <filename>

git rm documentation

git rm -f *.pyc
János Farkas
  • 453
  • 5
  • 14
-1

The solution is to clean the working dir and reset it to a prestine state prior to every usage or at least after each update of the checked-out revision.

Try something like (and be aware that it WILL delete files which are not tracked):

git clean -f

See also: How to remove local (untracked) files from the current Git working tree?

Community
  • 1
  • 1
planetmaker
  • 5,884
  • 3
  • 28
  • 37