# How to deal with mixed tree? 8 messages from 2011-11-22 to 2011-11-22. Participants: Pascal Obry, Holger Hellmuth, Junio C Hamano. Thread: https://gitlist.dev/t/28997 ## Pascal Obry, 2011-11-22 11:21 Subject: How to deal with mixed tree? Message-ID: URL: https://gitlist.dev/e/CA%2B9ZNic-9U0nP1NGL0shUijnxdhaoEHwyxWM8rOzR2B6Qjq6zQ%40mail.gmail.com ``` A project P1 is under Git. A project P2 is under Subversion. P2 in fact replace a sub-directory (say SD) in P1. The project P2 is a replacement (extension) of the code in P1. How to deal with this? If you clone P1, remove SD in P1 to replace it by P2: $ git diff -> will display all the changes in SD, is there a way to avoid that? $ git merge (between branches) will try to merge changes in SD I'd like to really tell Git to ignore SD as if it was not there. Any solution? Thanks, Pascal. -- --|------------------------------------------------------ --| Pascal Obry                           Team-Ada Member --| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE --|------------------------------------------------------ --|              http://www.obry.net --| "The best way to travel is by means of imagination" --| --| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595 ``` ## Holger Hellmuth, 2011-11-22 11:35 Subject: Re: How to deal with mixed tree? Message-ID: <4ECB8917.8010305@ira.uka.de> URL: https://gitlist.dev/e/4ECB8917.8010305%40ira.uka.de In-Reply-To: ``` On 22.11.2011 12:21, Pascal Obry wrote: > A project P1 is under Git. > > A project P2 is under Subversion. > > P2 in fact replace a sub-directory (say SD) in P1. The project P2 is a > replacement (extension) of the code in P1. > > How to deal with this? Remove SD in P1, make a logical link from P2 to SD, add SD to .git/info/exclude (see "Bug report - local (and git ignored) file silently removed after checkout" on the mailing list why exclude is better than .gitignore at the moment) ``` ## Pascal Obry, 2011-11-22 14:20 Subject: Re: How to deal with mixed tree? Message-ID: <4ECBAFB7.9040505@obry.net> URL: https://gitlist.dev/e/4ECBAFB7.9040505%40obry.net In-Reply-To: <4ECB8917.8010305@ira.uka.de> ``` Holger, > Remove SD in P1, make a logical link from P2 to SD, add SD to > .git/info/exclude Thanks for your quick reply. That's what I have tested but... > (see "Bug report - local (and git ignored) file silently removed after > checkout" on the mailing list why exclude is better than .gitignore at > the moment) Seems like this is working only if file names are different. This is not my case as the replacement is very similar. With the following script I'm expecting empty status and no diff: << #!/bin/sh # create sd (directory that will replace src2) mkdir sd echo sd1 > sd/file1 echo sd2 > sd/file2 # create Git repo mkdir repo cd repo git init mkdir src1 mkdir src2 echo file > src1/file echo 3 > src2/file3 git add . git ci -a -m "first" # let's replace src2 by sd rm -fr src2 # ln -s ../sd src2 cp -r ../sd src2 # make sure src2 is excluded echo 'src2/*' >> .git/info/exclude # the following output should be clean echo '============== Status' git status echo '============== Diff' git diff >> But the output is actually: Initialized empty Git repository in /home/obry/tmp/repo/.git/ [master (root-commit) 527c7a1] first 2 files changed, 2 insertions(+), 0 deletions(-) create mode 100644 src1/file create mode 100644 src2/file3 cp: cannot stat `../src': No such file or directory ============== Status # On branch master # Changes not staged for commit: # (use "git add/rm ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # # deleted: src2/file3 # no changes added to commit (use "git add" and/or "git commit -a") ============== Diff diff --git a/src2/file3 b/src2/file3 deleted file mode 100644 index 00750ed..0000000 --- a/src2/file3 +++ /dev/null @@ -1 +0,0 @@ -3 Any other idea? Thanks. -- --|------------------------------------------------------ --| Pascal Obry Team-Ada Member --| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE --|------------------------------------------------------ --| http://www.obry.net - http://v2p.fr.eu.org --| "The best way to travel is by means of imagination" --| --| gpg --keyserver keys.gnupg.net --recv-key F949BD3B ``` ## Holger Hellmuth, 2011-11-22 15:08 Subject: Re: How to deal with mixed tree? Message-ID: <4ECBBAD4.6080206@ira.uka.de> URL: https://gitlist.dev/e/4ECBBAD4.6080206%40ira.uka.de In-Reply-To: <4ECBAFB7.9040505@obry.net> ``` On 22.11.2011 15:20, Pascal Obry wrote: > > Holger, > >> Remove SD in P1, make a logical link from P2 to SD, add SD to >> .git/info/exclude > > Thanks for your quick reply. That's what I have tested but... > >> (see "Bug report - local (and git ignored) file silently removed after >> checkout" on the mailing list why exclude is better than .gitignore at >> the moment) > > Seems like this is working only if file names are different. This is not > my case as the replacement is very similar. With the following script > I'm expecting empty status and no diff: > > << > #!/bin/sh > > # create sd (directory that will replace src2) > mkdir sd > echo sd1> sd/file1 > echo sd2> sd/file2 > > # create Git repo > mkdir repo > cd repo > git init > mkdir src1 > mkdir src2 > echo file> src1/file > echo 3> src2/file3 > git add . > git ci -a -m "first" > > # let's replace src2 by sd > > rm -fr src2 > # ln -s ../sd src2 > cp -r ../sd src2 > > # make sure src2 is excluded > > echo 'src2/*'>> .git/info/exclude > > # the following output should be clean You should also remove src2 and all files in it from the git repository. Something like git rm -r src2 git ci echo 'src2' >> .git/info/exclude instead of rm -fr src2 echo 'src2/*' >> .git/info/exclude ``` ## Pascal Obry, 2011-11-22 15:21 Subject: Re: How to deal with mixed tree? Message-ID: <4ECBBDE3.3010904@obry.net> URL: https://gitlist.dev/e/4ECBBDE3.3010904%40obry.net In-Reply-To: <4ECBBAD4.6080206@ira.uka.de> ``` Holger, > You should also remove src2 and all files in it from the git repository. > Something like > > git rm -r src2 > git ci > echo 'src2' >> .git/info/exclude > > instead of > > rm -fr src2 > echo 'src2/*' >> .git/info/exclude Thanks this is working indeed. But it was not the whole story :) In fact I want to do that in a branch (say work) and keep master as-is as this branch is used to pull changes from origin. And in this case, doing 'git diff master' still shows the files under src2. See script to reproduce: << #!/bin/sh # create sd (directory that will replace src2) mkdir sd echo sd1 > sd/file1 echo sd2 > sd/file2 # create Git repo mkdir repo cd repo git init mkdir src1 mkdir src2 echo file > src1/file echo 3 > src2/file3 git add . git ci -a -m "first" # let's replace src2 by sd in branch work git checkout -b work git rm src2/* git ci -m "no more src2" # ln -s ../sd src2 cp -r ../sd src2 # make sure src2 is excluded echo 'src2' >> .git/info/exclude # the following output should be clean echo '============== Status' git status echo '============== Diff' git diff echo '============== Diff master' git diff master >> Is that possible? -- --|------------------------------------------------------ --| Pascal Obry Team-Ada Member --| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE --|------------------------------------------------------ --| http://www.obry.net - http://v2p.fr.eu.org --| "The best way to travel is by means of imagination" --| --| gpg --keyserver keys.gnupg.net --recv-key F949BD3B ``` ## Holger Hellmuth, 2011-11-22 16:14 Subject: Re: How to deal with mixed tree? Message-ID: <4ECBCA4F.5090505@ira.uka.de> URL: https://gitlist.dev/e/4ECBCA4F.5090505%40ira.uka.de In-Reply-To: <4ECBBDE3.3010904@obry.net> ``` On 22.11.2011 16:21, Pascal Obry wrote: > In fact I want to do that in a branch (say work) and keep master as-is > as this branch is used to pull changes from origin. And in this case, > doing 'git diff master' still shows the files under src2. See script to > reproduce: [...] > # let's replace src2 by sd in branch work > > git checkout -b work > git rm src2/* > git ci -m "no more src2" > # ln -s ../sd src2 > cp -r ../sd src2 > > # make sure src2 is excluded > > echo 'src2'>> .git/info/exclude > > # the following output should be clean > > echo '============== Status' > git status > > echo '============== Diff' > git diff > > echo '============== Diff master' > git diff master >>> > > Is that possible? > In my not-really-expert opinion no. At least git diff master has to show something because there obviously is a difference between what is in master (that you can't gitignore) and your branch (whether you ignore it or not). I would a) use a different directory name for src2 and adapt the Makefile to cope with that or b) remove the src2 link from .git/info/exclude and commit it into the branch. That way whenever you switch branch and master, the correct dir or link will be present and still because of the link none of the files in the svn will be handled by git in any way ``` ## Pascal Obry, 2011-11-22 17:29 Subject: Re: How to deal with mixed tree? Message-ID: <4ECBDC12.3050308@obry.net> URL: https://gitlist.dev/e/4ECBDC12.3050308%40obry.net In-Reply-To: <4ECBCA4F.5090505@ira.uka.de> ``` Holger, > In my not-really-expert opinion no. At least git diff master has to show > something because there obviously is a difference between what is in > master (that you can't gitignore) and your branch (whether you ignore it > or not). I had come to the same conclusion. Sad, it would have been nice to have an option to fully ignore a path in a repository. Anyway, thanks a lot for your feedback. Pascal. -- --|------------------------------------------------------ --| Pascal Obry Team-Ada Member --| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE --|------------------------------------------------------ --| http://www.obry.net - http://v2p.fr.eu.org --| "The best way to travel is by means of imagination" --| --| gpg --keyserver keys.gnupg.net --recv-key F949BD3B ``` ## Junio C Hamano, 2011-11-22 18:29 Subject: Re: How to deal with mixed tree? Message-ID: <7vk46sdn8r.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vk46sdn8r.fsf%40alter.siamese.dyndns.org In-Reply-To: <4ECB8917.8010305@ira.uka.de> ``` Holger Hellmuth writes: > (see "Bug report - local (and git ignored) file silently removed after > checkout" on the mailing list why exclude is better than .gitignore at > the moment) Don't look at it or encourage people to rely on that bug to be fixed. exclude and .gitignore should behave the same way. ```