From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Petr Baudis <pasky@ucw.cz>, Josh Triplett <josh@joshtriplett.org>
Subject: [PATCH 3/3] t3010: update to demonstrate "ls-files -k" optimization pitfalls
Date: Thu, 15 Aug 2013 14:28:10 -0700 [thread overview]
Message-ID: <1376602090-19142-4-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1376602090-19142-1-git-send-email-gitster@pobox.com>
An earlier draft of the previous step used cache_name_exists() to
check the directory we were looking at, which missed the second case
described in its log message. Demonstrate why it is not sufficient.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
t/t3010-ls-files-killed-modified.sh | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/t/t3010-ls-files-killed-modified.sh b/t/t3010-ls-files-killed-modified.sh
index 95671c2..6ea7ca8 100755
--- a/t/t3010-ls-files-killed-modified.sh
+++ b/t/t3010-ls-files-killed-modified.sh
@@ -11,6 +11,7 @@ This test prepares the following in the cache:
path1 - a symlink
path2/file2 - a file in a directory
path3/file3 - a file in a directory
+ pathx/ju - a file in a directory
and the following on the filesystem:
@@ -21,6 +22,7 @@ and the following on the filesystem:
path4 - a file
path5 - a symlink
path6/file6 - a file in a directory
+ pathx/ju/nk - a file in a directory to be killed
git ls-files -k should report that existing filesystem
objects except path4, path5 and path6/file6 to be killed.
@@ -44,16 +46,17 @@ then
else
date > path1
fi
-mkdir path2 path3
+mkdir path2 path3 pathx
date >path2/file2
date >path3/file3
+>pathx/ju
: >path7
date >path8
: >path9
date >path10
test_expect_success \
'git update-index --add to add various paths.' \
- "git update-index --add -- path0 path1 path?/file? path7 path8 path9 path10"
+ "git update-index --add -- path0 path1 path?/file? pathx/ju path7 path8 path9 path10"
rm -fr path? ;# leave path10 alone
date >path2
@@ -65,7 +68,7 @@ else
date > path3
date > path5
fi
-mkdir path0 path1 path6
+mkdir -p path0 path1 path6 pathx/ju
date >path0/file0
date >path1/file1
date >path6/file6
@@ -73,6 +76,7 @@ date >path7
: >path8
: >path9
touch path10
+>pathx/ju/nk
test_expect_success \
'git ls-files -k to show killed files.' \
@@ -82,6 +86,7 @@ path0/file0
path1/file1
path2
path3
+pathx/ju/nk
EOF
test_expect_success \
@@ -98,6 +103,7 @@ path2/file2
path3/file3
path7
path8
+pathx/ju
EOF
test_expect_success \
--
1.8.4-rc3-232-ga8053f8
next prev parent reply other threads:[~2013-08-15 21:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-10 21:44 git stash takes excessively long when many untracked files present Josh Triplett
2013-08-13 10:11 ` Anders Darander
2013-08-13 17:07 ` Junio C Hamano
2013-08-13 17:36 ` Anders Darander
2013-08-13 17:52 ` Junio C Hamano
2013-08-13 21:47 ` Junio C Hamano
2013-08-15 17:52 ` Junio C Hamano
2013-08-15 18:07 ` Josh Triplett
2013-08-15 18:58 ` Junio C Hamano
2013-08-15 19:47 ` Junio C Hamano
2013-08-15 21:28 ` [PATCH 0/3] Optimizing "ls-files -k" Junio C Hamano
2013-08-15 21:28 ` [PATCH 1/3] dir.c: use the cache_* macro to access the current index Junio C Hamano
2013-08-15 21:28 ` [PATCH 2/3] ls-files -k: a directory only can be killed if the index has a non-directory Junio C Hamano
2013-08-15 21:28 ` Junio C Hamano [this message]
2013-08-15 23:30 ` [PATCH 4/3] git stash: avoid data loss when "git stash save" kills a directory Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376602090-19142-4-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=josh@joshtriplett.org \
--cc=pasky@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).