Skip to contentSkip to conversation

behaviour of .gitignore

DISCUSSION J.V. 3 participants 3 messages Jun 15, 2016

lore
Share & tools
lore

J.V.

author
#0 lore raw

On my local machine, I create a /bin/ directory added some bash scripts, comitted and then pushed them to the repository.

Now today I do a git pull and they are gone but cannot see that anyone deleted them in the git log / history, but there is a /bin/ entry in the .gitignore file.

Does this mean, the files are still in the shared repository (orgin) that I could get them back?

I tried removing /bin/ from the git ignore and doing a pull but my /bin/ directory is still not there.

Is there anyway to do a pull now and have it look at my local gitignore and pull the directory back?

thanks

J.V.

#1 lore raw
Quoted 3 lines · J.V.

On my local machine, I create a /bin/ directory added some bash scripts, comitted and then pushed them to the repository.

You should be able to click on that commit in gitk and see that the files were added (confirm you really added them).

Quoted 4 lines

Now today I do a git pull and they are gone but cannot see that anyone deleted them in the git log / history, but there is a /bin/ entry in the .gitignore file.

If that ignore entry was there when you did the commit then maybe you never really committed them.

Quoted 3 lines

Does this mean, the files are still in the shared repository (orgin)
that I could get them back?

The gitk step above will tell you if they are there.

Quoted 3 lines

I tried removing /bin/ from the git ignore and doing a pull but my /bin/ directory is still not there.

Its not looking like you really committed them like you thought you did.

Quoted 3 lines

Is there anyway to do a pull now and have it look at my local gitignore and pull the directory back?

If the files were really committed, then you should have that commit in
your history also. Therefore, you should be able to 'git checkout' those files into your worktree.

v/r,
neal

#2 lore raw
In reply to J.V.
Quoted 2 lines · J.V.

On my local machine, I create a /bin/ directory added some bash scripts, comitted and then pushed them to the repository.

Can you check that "git show --stat" on the commit you did actually shows the files as added?

Quoted 3 lines

Now today I do a git pull and they are gone but cannot see that anyone deleted them in the git log / history, but there is a /bin/ entry in the .gitignore file.

What does "git log -- bin" say?

What does "git status" say?

Signature · 2 lines
Matthieu Moy
http://www-verimag.imag.fr/~moy/