diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-03 20:42:47 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-04 00:55:12 -0800 |
| commit | aca085e577688108a2480b96a2f7077424a74e4d (patch) | |
| tree | c5ffc1a20ac48ae96c013a9fc27520f1d78b1410 /t/t7001-mv.sh | |
| parent | git-svn: avoid fetching files twice in the same revision (diff) | |
| download | tgif-aca085e577688108a2480b96a2f7077424a74e4d.tar.xz | |
git-mv: search more precisely for source directory in index
A move of a directory should find the entries in the index by
searching for the name _including_ the slash. Otherwise, the
directory can be shadowed by a file when it matches the prefix
and is lexicographically smaller, e.g. "ab.c" shadows "ab/".
Noticed by Sergey Vlasov.
[jc: added Sergey's original reproduction recipe as a test case
at the end of t7001.]
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t7001-mv.sh')
| -rwxr-xr-x | t/t7001-mv.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index 23a1eff3bb..2f4ff82e14 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -105,4 +105,17 @@ test_expect_success "Michael Cassar's test case" ' } ' +rm -fr papers partA path? + +test_expect_success "Sergey Vlasov's test case" ' + rm -fr .git && + git init-db && + mkdir ab && + date >ab.c && + date >ab/d && + git add ab.c ab && + git commit -m 'initial' && + git mv ab a +' + test_done |