{"thread":{"id":"16758","subject":"Strange untracked file behaviour","startedAt":"2008-12-16T23:24:52Z","lastAt":"2008-12-17T14:38:25Z","messageCount":3,"participants":["Miklos Vajna","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"98088","messageId":"20081216232452.GV5691@genesis.frugalware.org","threadId":"16758","inReplyTo":null,"subject":"Strange untracked file behaviour","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-12-16T23:24:52Z","receivedAt":"2008-12-16T23:24:52Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"Hi,\n\nHere is a copy of the udev repo I cloned some time ago:\n\nhttp://frugalware.org/~vmiklos/files/udev.tar.bz2\n\nI did not modify it, so I thought a simple 'git pull' can update it.\n\n$ git pull\nUpdating 661a0be..b6626d0\nerror: Untracked working tree file 'test/sys/class/misc/rtc/dev' would\nbe removed by merge.\n\nOk, let's clean the untracked files:\n\n$ git clean -x -d -f\n\nBut it does not remove any file.\n\n$ git ls-files|grep test/sys/class/misc/rtc/dev\ntest/sys/class/misc/rtc/dev\n\nSo it seems git-clean is right.\n\n$ git pull -s resolve\nUpdating 661a0be..b6626d0\nerror: Untracked working tree file 'test/sys/class/misc/rtc/dev' would\nbe removed by merge.\n\nSo it does not seem to be merge-recursive-related.\n\nDoes somebody have an idea what's going on? :)\n\n$ git version\ngit version 1.6.1.rc1.35.gae26e.dirty\n\n('dirty' is due to non-code changes in my working directory.)\n\nLet me know if you need more details.\n\nThanks.\n"},{"id":"98098","messageId":"alpine.DEB.1.00.0812170605300.14632@racer","threadId":"16758","inReplyTo":"20081216232452.GV5691@genesis.frugalware.org","subject":"Re: Strange untracked file behaviour","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-12-17T05:09:16Z","receivedAt":"2008-12-17T05:09:16Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 17 Dec 2008, Miklos Vajna wrote:\n\n> Here is a copy of the udev repo I cloned some time ago:\n> \n> http://frugalware.org/~vmiklos/files/udev.tar.bz2\n> \n> I did not modify it, so I thought a simple 'git pull' can update it.\n> \n> $ git pull\n> Updating 661a0be..b6626d0\n> error: Untracked working tree file 'test/sys/class/misc/rtc/dev' would\n> be removed by merge.\n\nI just spent three hours narrowing it down to this test case (but now I \nhave to catch 3 hours of sleep):\n\n-- snipsnap --\n[PATCH] Miklos' testcase\n\nEven if we would not handle symlink/directory conflicts gracefully (which \nwe do, though), those conflicts should not affect unchanged files at all, \nespecially not claiming that they are untracked.\n\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n t/t1008-read-tree-sd.sh |   39 +++++++++++++++++++++++++++++++++++++++\n 1 files changed, 39 insertions(+), 0 deletions(-)\n create mode 100644 t/t1008-read-tree-sd.sh\n\ndiff --git a/t/t1008-read-tree-sd.sh b/t/t1008-read-tree-sd.sh\nnew file mode 100644\nindex 0000000..4d74430\n--- /dev/null\n+++ b/t/t1008-read-tree-sd.sh\n@@ -0,0 +1,39 @@\n+#!/bin/sh\n+#\n+# Copyright (c) 2008 Johannes E. Schindelin\n+#\n+\n+test_description='symlink/directory conflict'\n+\n+. ./test-lib.sh\n+\n+test_expect_success 'setup' '\n+\n+\tmkdir -p alpha/beta/gamma &&\n+\tln -s delta alpha/beta/gamma/epsilon &&\n+\tmkdir -p alpha/beta/theta &&\n+\tln -s zeta alpha/beta/theta/eta &&\n+\tmkdir -p iota/kappa/lambda/ &&\n+\t: > iota/kappa/lambda/mu &&\n+\tgit add . &&\n+\ttest_tick &&\n+\tgit commit -m initial &&\n+\n+\tgit rm -r alpha/beta/gamma &&\n+\tln -s nu alpha/beta/gamma &&\n+\tgit rm -r alpha/beta/theta &&\n+\tln -s xi alpha/beta/theta &&\n+\tgit add . &&\n+\ttest_tick &&\n+\tgit commit -m 2nd\n+\n+'\n+\n+test_expect_failure 'read-tree -u -m handles symlinks gracefully' '\n+\n+\tgit checkout -b side HEAD^ &&\n+\tgit read-tree -u -m master\n+\n+'\n+\n+test_done\n-- \n1.6.0.4.1189.g8876f\n"},{"id":"98146","messageId":"20081217143825.GC5691@genesis.frugalware.org","threadId":"16758","inReplyTo":"alpine.DEB.1.00.0812170605300.14632@racer","subject":"Re: Strange untracked file behaviour","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-12-17T14:38:25Z","receivedAt":"2008-12-17T14:38:25Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Wed, Dec 17, 2008 at 06:09:16AM +0100, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:\n> I just spent three hours narrowing it down to this test case (but now I \n> have to catch 3 hours of sleep):\n\nThank you very much! :-)\n"}]}