Git question

Robert Saylor
Robert Saylor used Ask the Experts™
on
I moved a bunch of smarty template files to a sub directory. When I issue git status it shows the new directories but also shows the old files deleted.

Is it safe to issue "git rm directory/oldfile.tpl" then "git add directory/directory2/newfile.tpl" ?
Comment
Watch Question

Do more with

Expert Office
EXPERT OFFICE® is a registered trademark of EXPERTS EXCHANGE®
Jeff DarlingDeveloper Analyst

Commented:
Do you see the new files that were created in the sub folder?

How did you perform the move?  Was it using git or command line move or windows explorer?

Is the history of the files prior to the move important to you?
Robert SaylorSenior Developer

Author

Commented:
Yes, the new files are in the new folder. I manually moved them from the old location to the new location using the file system.

The files are stored on a linux server but I moved them via Mac finder on a mounted volume (remote web disk)

I will make a backup first before I commit just want clarification this is ok or is there a proper way to move files in a repository.
Robert SaylorSenior Developer

Author

Commented:
oh, the history is not important on these files as there is minor or no change from the original. Was adding organization as I have too many template files already in my project.
Python 3 Fundamentals

This course will teach participants about installing and configuring Python, syntax, importing, statements, types, strings, booleans, files, lists, tuples, comprehensions, functions, and classes.

Developer Analyst
Commented:
There is a move command in git that is the way to do it.  

mkdir -p x/p/q      # make sure the parent directories exist first
git mv x/* x/p/q    # move folder, with history preserved
git commit -m "changed the foldername x into x/p/q"

Open in new window


If you don't care about the history, you could add them.
Robert SaylorSenior Developer

Author

Commented:
if I wanted to move a single file would it be:

git mv directory/filename.ext directory/directory2/filename.ext

?
Robert SaylorSenior Developer

Author

Commented:
just a followup. I committed my changes this morning. I safely added the new directories and removed the old files that are no longer in the old directory. Git treated it as a rename. All is good.

I have some more files to organize this week so will give the git mv a try then.

My template directory was getting close to 50+ files so was making it hard to keep things straight.

Do more with

Expert Office
Submit tech questions to Ask the Experts™ at any time to receive solutions, advice, and new ideas from leading industry professionals.

Start 7-Day Free Trial