Re: How to deal with mixed tree?

Holger,

Thanks for your quick reply. That's what I have tested but...

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 <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working
directory)
#
#	deleted:    src2/file3
#
no changes added to commit (use "git add" and/or "git commit -a")
============== Diff