How to update the directory in git

Question

I have a bitbucket repository, with the following structure :

 Directory-A->
   directory a
   directory b
   file a
   file b
   file c

Now I want to move file "b" and file "c" to "directory a"

When I do it on local machine and commit this by git add. I get file b and file c in directory a but they still exists outside it.

When you move files, you need to `add` the new ones (new location) but also `rm` the old ones (old location). — Peque, Jun 12 '15 at 11:17
I have hundreds of files and I dont want to use rm for each one — Shruti Srivastava, Jun 12 '15 at 11:18
but it doesnt remove files from their previous prositions...is therea better way out than removing each one manually — Shruti Srivastava, Jun 12 '15 at 11:20
What? git add -A . would have done what Saurabh suggest. It does include git add -u — VonC, Jun 26 '15 at 07:07
Let me know how it works. I had the right answer *before* Saurabh — VonC, Jun 26 '15 at 11:18
Again, `git -A` is `git add -u` + `git add`: What Saurabh said is exactly my answer. What is going on here? — VonC, Jun 27 '15 at 04:42
Strange... Saurabh's account has been deleted... So, does `git add -A .` (or `git add -u .` + `git add .`) works? — VonC, Jun 29 '15 at 06:01
Just to be sure: git mv is only valid if you haven't already moved your file. Again, if you have moved them, git add -A is the answer. — VonC, Jun 30 '15 at 17:55

score 4 · Answer 1 · edited May 23 '17 at 10:32

When I do it on local machine and commit this by git add. I get file b and file c in directory a but they still exists outside it.

That is because you did a git add . in directory a instead of a git add -A . in Directory-A.

First, you need to be in Directory-A (the root one) when you do the git add -A . (which is a git add -u + git add .) from the root folder:

Directory-A->  <====== there: git add -A .
   directory a
     file b
     file c
   directory b
   file a

A 'git add -A .' in Directory-A will detect the deletion of those files in Directory-A and their addition in directory a.

See more at "Difference between “git add -A” and “git add .”":

score 4 · Answer 2 · edited Jun 30 '15 at 14:59

4

Here is a better alternative. Try the following:

git mv "file b" "file c" "directory a"

Followed by:

git commit -am "hey I moved filed"

Note: I've only used the -am flag for demonstration purposes. It is not a good practice. You should commit only files with related changes together which makes your repository maintainable.

edited Jun 30 '15 at 14:59

cyberbit

1,345
15
22

answered Jun 30 '15 at 12:30

psiyumm

6,437
3
29
50

mikhail-t · Answer 3 · 2015-06-30T20:29:56.750

I usually do it like this, I believe it's even easier and will work for entire project:

Physically move files b and c into directory a (using file explorer or command line).
Run this Git command in your project:

git add -u

(it will auto remove all deleted files from Git index: since you moved your files physically Git will consider them 'deleted' from old location and created at the new one)
Now add all changed/created files to new commit:

git add .
Commit changes as usual:

git commit -m "Moved files b and c into directory a"

Here is more info on git add -u command (-u is a shorthand for --update):

... removes as well as modifies index entries to match the working tree, but adds no new files ... all tracked files in the entire working tree are updated ...

Source: http://www.git-scm.com/docs/git-add (look for --update section)

score 0 · Answer 4 · answered Jun 30 '15 at 21:13

Quick fix. Run:

git add -A :/
git status

Then make sure that only files you want to add/delete/modify have been staged. That's very important. If you've accidentally staged extraneous changes, run git reset. If you're sure you want to proceed, run git commit.

Without -A, git add only stages file additions and modifications. It will not delete entire files, and moves will turn into copies. git add -A deletes files that no longer exist.

:/ is a shortcut that means the root of the repository, rather than the current directory. If your current directory is the root of the repository, you can omit this.

Note that running git add -A--especially in the root of a repository--is generally considered dangerous. Do not get into the habit of blindly committing every change you've made: only stage what you know you want to change. However, when you're moving a large number of files around, this is quite a handy utility.

score 0 · Answer 5 · answered Jul 01 '15 at 07:53

0

This should work.

git mv "file a" "directory a"/

git mv "file b" "directory a"/

git commit -m "Files a and b are moved to directory a"

Happy Coding.

answered Jul 01 '15 at 07:53

shoan

1,303
15
22

How to update the directory in git

5 Answers5