summaryrefslogtreecommitdiff
path: root/symlinks.c
diff options
context:
space:
mode:
authorPickens, James E <james.e.pickens@intel.com>2009-07-29 21:02:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-30 03:18:25 (GMT)
commit4f6339b0c353b5c03b566b605e50a743d97fc08e (patch)
treec064c9d111973117579aaa0fee2fc95e93288579 /symlinks.c
parent0a53e9ddeaddad63ad106860237bbf53411d11a7 (diff)
downloadgit-4f6339b0c353b5c03b566b605e50a743d97fc08e.zip
git-4f6339b0c353b5c03b566b605e50a743d97fc08e.tar.gz
git-4f6339b0c353b5c03b566b605e50a743d97fc08e.tar.bz2
Demonstrate bugs when a directory is replaced with a symlink
This test creates two directories, a/b and a/b-2, then replaces a/b with a symlink to a/b-2, then merges that change into the 'baseline' commit, which contains an unrelated change. There are two bugs: 1. 'git checkout' incorrectly deletes work tree file a/b-2/d. 2. 'git merge' incorrectly deletes work tree file a/b-2/d. The test goes on to create another branch in which a/b-2 is replaced with a symlink to a/b (i.e., the reverse of what was done the first time), and merge it into the 'baseline' commit. There is a different bug: 3. The merge should be clean, but git reports a conflict. Signed-off-by: James Pickens <james.e.pickens@intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'symlinks.c')
0 files changed, 0 insertions, 0 deletions