# move git repository out of a folder? 5 messages from 2008-06-04 to 2008-06-04. Participants: Sean Brown, Shawn O. Pearce, Avery Pennarun, Jakub Narebski. Thread: https://gitlist.dev/t/13800 ## Sean Brown, 2008-06-04 20:03 Subject: move git repository out of a folder? Message-ID: <1086fb5f0806041303v7856404dxb95b5a450ac30ae1@mail.gmail.com> URL: https://gitlist.dev/e/1086fb5f0806041303v7856404dxb95b5a450ac30ae1%40mail.gmail.com ``` Let's say I've got this directory structure of source files: /folderA /folderA/sourcecode/ /folderA/sourcecode/file1.txt /folderA/sourcecode/file2.txt etc... When putting the project under git source control, I did this: cd /folderA git init So now when colleagues clone my repository, they get the source code in the "sourcecode" folder. I'd like to just make the repository simply give them the source files, not in a directory. In other words, as if I had originally been smart and done this: cd /folderA/sourcecode git init Can I make that happen without losing all of the history? Thanks, Sean ``` ## Shawn O. Pearce, 2008-06-04 20:07 Subject: Re: move git repository out of a folder? Message-ID: <20080604200724.GV12896@spearce.org> URL: https://gitlist.dev/e/20080604200724.GV12896%40spearce.org In-Reply-To: <1086fb5f0806041303v7856404dxb95b5a450ac30ae1@mail.gmail.com> ``` Sean Brown wrote: > Let's say I've got this directory structure of source files: > > /folderA > /folderA/sourcecode/ > /folderA/sourcecode/file1.txt > /folderA/sourcecode/file2.txt > etc... > > When putting the project under git source control, I did this: > > cd /folderA > git init > > So now when colleagues clone my repository, they get the source code > in the "sourcecode" folder. I'd like to just make the repository > simply give them the source files, not in a directory. In other > words, as if I had originally been smart and done this: > > cd /folderA/sourcecode > git init > > Can I make that happen without losing all of the history? git mv sourcecode/* . rmdir sourcecode git commit -- Shawn. ``` ## Avery Pennarun, 2008-06-04 20:08 Subject: Re: move git repository out of a folder? Message-ID: <32541b130806041308y43a18b50s5dbca61f96a52823@mail.gmail.com> URL: https://gitlist.dev/e/32541b130806041308y43a18b50s5dbca61f96a52823%40mail.gmail.com In-Reply-To: <1086fb5f0806041303v7856404dxb95b5a450ac30ae1@mail.gmail.com> ``` On 6/4/08, Sean Brown wrote: > So now when colleagues clone my repository, they get the source code > in the "sourcecode" folder. I'd like to just make the repository > simply give them the source files, not in a directory. In other > words, as if I had originally been smart and done this: > > cd /folderA/sourcecode > git init > > Can I make that happen without losing all of the history? You could just make a commit which renames all the files into the parent folder. This is relatively harmless and correctly reflects what really happened. You might also want to look at git-filter-branch and its "--subdirectory-filter" option. Have fun, Avery ``` ## Jakub Narebski, 2008-06-04 20:14 Subject: Re: move git repository out of a folder? Message-ID: URL: https://gitlist.dev/e/m31w3dyn2n.fsf%40localhost.localdomain In-Reply-To: <20080604200724.GV12896@spearce.org> ``` "Shawn O. Pearce" writes: > Sean Brown wrote: > > > > Let's say I've got this directory structure of source files: > > > > /folderA > > /folderA/sourcecode/ > > /folderA/sourcecode/file1.txt > > /folderA/sourcecode/file2.txt > > etc... > > > > When putting the project under git source control, I did this: > > > > cd /folderA > > git init > > > > So now when colleagues clone my repository, they get the source code > > in the "sourcecode" folder. I'd like to just make the repository > > simply give them the source files, not in a directory. In other > > words, as if I had originally been smart and done this: > > > > cd /folderA/sourcecode > > git init > > > > Can I make that happen without losing all of the history? > > git mv sourcecode/* . > rmdir sourcecode > git commit What he said. Git should automatically detect renames. When pulling code from someone who hasn't made this change yet, you might need to use 'subtree' merge strategy, as currently git would put files added as sourcecode/filename in sourcecode/filename, not as top dir filename when pulling from side branch. If you want to _change history_, as if you made correct decision at the start (and convince everyone to reclone, or to do the same surgery; or if you for the time being are solo contributor to the project), you can use git-filter-branch (formerly cg-admin-rewrite-hist ;-). HTH -- Jakub Narebski Poland ShadeHawk on #git ``` ## Sean Brown, 2008-06-04 20:18 Subject: Re: move git repository out of a folder? Message-ID: <1086fb5f0806041318u3b1c4a3cg4dbc73fb638ea16b@mail.gmail.com> URL: https://gitlist.dev/e/1086fb5f0806041318u3b1c4a3cg4dbc73fb638ea16b%40mail.gmail.com In-Reply-To: ``` On Wed, Jun 4, 2008 at 4:14 PM, Jakub Narebski wrote: > "Shawn O. Pearce" writes: > >> Sean Brown wrote: >> > >> > Let's say I've got this directory structure of source files: >> > >> > /folderA >> > /folderA/sourcecode/ >> > /folderA/sourcecode/file1.txt >> > /folderA/sourcecode/file2.txt >> > etc... >> > >> > When putting the project under git source control, I did this: >> > >> > cd /folderA >> > git init >> > >> > So now when colleagues clone my repository, they get the source code >> > in the "sourcecode" folder. I'd like to just make the repository >> > simply give them the source files, not in a directory. In other >> > words, as if I had originally been smart and done this: >> > >> > cd /folderA/sourcecode >> > git init >> > >> > Can I make that happen without losing all of the history? >> >> git mv sourcecode/* . >> rmdir sourcecode >> git commit > > What he said. Git should automatically detect renames. When pulling > code from someone who hasn't made this change yet, you might need to > use 'subtree' merge strategy, as currently git would put files added > as sourcecode/filename in sourcecode/filename, not as top dir filename > when pulling from side branch. > > If you want to _change history_, as if you made correct decision at > the start (and convince everyone to reclone, or to do the same > surgery; or if you for the time being are solo contributor to the > project), you can use git-filter-branch (formerly cg-admin-rewrite-hist ;-). > Thank you Shawn and Jakub. This worked perfectly. Sean ```