2005-11-29 22:10:24 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
2007-07-03 05:52:14 +00:00
|
|
|
test_description='git mv in subdirs'
|
2005-11-29 22:10:24 +00:00
|
|
|
. ./test-lib.sh
|
2021-10-15 09:30:17 +00:00
|
|
|
. "$TEST_DIRECTORY"/lib-diff-data.sh
|
2005-11-29 22:10:24 +00:00
|
|
|
|
2023-05-08 19:01:12 +00:00
|
|
|
index_at_path () {
|
2023-05-08 19:01:46 +00:00
|
|
|
git ls-files --format='%(objectmode) %(objectname) %(stage)' "$@"
|
2023-05-08 19:01:12 +00:00
|
|
|
}
|
|
|
|
|
2022-03-29 01:07:07 +00:00
|
|
|
test_expect_success 'mv -f refreshes updated index entry' '
|
|
|
|
echo test >bar &&
|
|
|
|
git add bar &&
|
|
|
|
git commit -m test &&
|
|
|
|
|
|
|
|
echo foo >foo &&
|
|
|
|
git add foo &&
|
|
|
|
|
|
|
|
# Wait one second to ensure ctime of rename will differ from original
|
|
|
|
# file creation ctime.
|
|
|
|
sleep 1 &&
|
|
|
|
git mv -f foo bar &&
|
|
|
|
git reset --merge HEAD &&
|
|
|
|
|
|
|
|
# Verify the index has been reset
|
|
|
|
git diff-files >out &&
|
|
|
|
test_must_be_empty out
|
|
|
|
'
|
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'prepare reference tree' '
|
2021-02-11 19:46:56 +00:00
|
|
|
mkdir path0 path1 &&
|
2021-10-15 09:30:17 +00:00
|
|
|
COPYING_test_data >path0/COPYING &&
|
2021-02-11 19:46:56 +00:00
|
|
|
git add path0/COPYING &&
|
|
|
|
git commit -m add -a
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2005-11-29 22:10:24 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'moving the file out of subdirectory' '
|
2021-02-11 19:47:00 +00:00
|
|
|
git -C path0 mv COPYING ../path1/COPYING
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2005-11-29 22:10:24 +00:00
|
|
|
|
|
|
|
# in path0 currently
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'commiting the change' '
|
2021-02-11 19:47:00 +00:00
|
|
|
git commit -m move-out -a
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2005-11-29 22:10:24 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'checking the commit' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
|
|
|
|
grep "^R100..*path0/COPYING..*path1/COPYING" actual
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2005-11-29 22:10:24 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'moving the file back into subdirectory' '
|
2021-02-11 19:47:00 +00:00
|
|
|
git -C path0 mv ../path1/COPYING COPYING
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2006-03-03 16:23:32 +00:00
|
|
|
|
|
|
|
# in path0 currently
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'commiting the change' '
|
2021-02-11 19:47:00 +00:00
|
|
|
git commit -m move-in -a
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'checking the commit' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
|
|
|
|
grep "^R100..*path1/COPYING..*path0/COPYING" actual
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'mv --dry-run does not move file' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git mv -n path0/COPYING MOVED &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_file path0/COPYING &&
|
|
|
|
test_path_is_missing MOVED
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2017-12-31 19:11:55 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'checking -k on non-existing file' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git mv -k idontexist path0
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2009-01-14 17:03:21 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'checking -k on untracked file' '
|
2021-02-11 19:47:01 +00:00
|
|
|
>untracked1 &&
|
2021-02-11 19:46:56 +00:00
|
|
|
git mv -k untracked1 path0 &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_file untracked1 &&
|
|
|
|
test_path_is_missing path0/untracked1
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2009-01-14 17:03:21 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'checking -k on multiple untracked files' '
|
2021-02-11 19:47:01 +00:00
|
|
|
>untracked2 &&
|
2021-02-11 19:46:56 +00:00
|
|
|
git mv -k untracked1 untracked2 path0 &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_file untracked1 &&
|
|
|
|
test_path_is_file untracked2 &&
|
|
|
|
test_path_is_missing path0/untracked1 &&
|
|
|
|
test_path_is_missing path0/untracked2
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2009-01-14 17:03:21 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'checking -f on untracked file with existing target' '
|
2021-02-11 19:47:01 +00:00
|
|
|
>path0/untracked1 &&
|
2021-02-11 19:46:56 +00:00
|
|
|
test_must_fail git mv -f untracked1 path0 &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_missing .git/index.lock &&
|
|
|
|
test_path_is_file untracked1 &&
|
|
|
|
test_path_is_file path0/untracked1
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2009-02-04 09:32:07 +00:00
|
|
|
|
2009-01-14 17:03:21 +00:00
|
|
|
# clean up the mess in case bad things happen
|
|
|
|
rm -f idontexist untracked1 untracked2 \
|
|
|
|
path0/idontexist path0/untracked1 path0/untracked2 \
|
|
|
|
.git/index.lock
|
2013-12-03 08:32:04 +00:00
|
|
|
rmdir path1
|
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'moving to absent target with trailing slash' '
|
2021-02-11 19:46:56 +00:00
|
|
|
test_must_fail git mv path0/COPYING no-such-dir/ &&
|
|
|
|
test_must_fail git mv path0/COPYING no-such-dir// &&
|
|
|
|
git mv path0/ no-such-dir/ &&
|
|
|
|
test_path_is_dir no-such-dir
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2013-12-03 08:32:04 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'clean up' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git reset --hard
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2013-12-03 08:32:04 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'moving to existing untracked target with trailing slash' '
|
2021-02-11 19:46:56 +00:00
|
|
|
mkdir path1 &&
|
|
|
|
git mv path0/ path1/ &&
|
|
|
|
test_path_is_dir path1/path0/
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2013-12-03 08:32:04 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'moving to existing tracked target with trailing slash' '
|
2021-02-11 19:46:56 +00:00
|
|
|
mkdir path2 &&
|
|
|
|
>path2/file && git add path2/file &&
|
|
|
|
git mv path1/path0/ path2/ &&
|
|
|
|
test_path_is_dir path2/path0/
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2013-12-03 08:32:04 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'clean up' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git reset --hard
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2009-01-14 17:03:21 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'adding another file' '
|
2021-10-15 09:30:17 +00:00
|
|
|
COPYING_test_data | tr A-Za-z N-ZA-Mn-za-m >path0/README &&
|
2021-02-11 19:46:56 +00:00
|
|
|
git add path0/README &&
|
|
|
|
git commit -m add2 -a
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2006-07-26 13:44:08 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'moving whole subdirectory' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git mv path0 path2
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2006-07-26 13:44:08 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'commiting the change' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git commit -m dir-move -a
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2006-07-26 13:44:08 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'checking the commit' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
|
|
|
|
grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
|
|
|
|
grep "^R100..*path0/README..*path2/README" actual
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2006-07-26 13:44:08 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'succeed when source is a prefix of destination' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git mv path2/COPYING path2/COPYING-renamed
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2006-08-16 00:20:32 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'moving whole subdirectory into subdirectory' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git mv path2 path1
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2006-07-26 17:41:05 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'commiting the change' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git commit -m dir-move -a
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2006-07-26 17:41:05 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'checking the commit' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
|
|
|
|
grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
|
|
|
|
grep "^R100..*path2/README..*path1/path2/README" actual
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2006-07-26 17:41:05 +00:00
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'do not move directory over existing directory' '
|
2021-02-11 19:47:02 +00:00
|
|
|
mkdir path0 &&
|
|
|
|
mkdir path0/path2 &&
|
|
|
|
test_must_fail git mv path2 path0
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2006-07-26 17:47:54 +00:00
|
|
|
|
2023-08-09 07:47:41 +00:00
|
|
|
test_expect_success 'rename directory to non-existing directory' '
|
|
|
|
mkdir dir-a &&
|
|
|
|
>dir-a/f &&
|
|
|
|
git add dir-a &&
|
|
|
|
git mv dir-a non-existing-dir
|
|
|
|
'
|
|
|
|
|
2021-02-11 19:46:55 +00:00
|
|
|
test_expect_success 'move into "."' '
|
2021-02-11 19:46:56 +00:00
|
|
|
git mv path1/path2/ .
|
2021-02-11 19:46:55 +00:00
|
|
|
'
|
2006-08-18 10:42:39 +00:00
|
|
|
|
2006-10-02 05:22:07 +00:00
|
|
|
test_expect_success "Michael Cassar's test case" '
|
|
|
|
rm -fr .git papers partA &&
|
2007-01-12 21:01:46 +00:00
|
|
|
git init &&
|
2006-10-02 05:22:07 +00:00
|
|
|
mkdir -p papers/unsorted papers/all-papers partA &&
|
2021-02-11 19:46:59 +00:00
|
|
|
echo a >papers/unsorted/Thesis.pdf &&
|
|
|
|
echo b >partA/outline.txt &&
|
|
|
|
echo c >papers/unsorted/_another &&
|
2006-10-02 05:22:07 +00:00
|
|
|
git add papers partA &&
|
2016-01-07 13:51:47 +00:00
|
|
|
T1=$(git write-tree) &&
|
2006-10-02 05:22:07 +00:00
|
|
|
|
|
|
|
git mv papers/unsorted/Thesis.pdf papers/all-papers/moo-blah.pdf &&
|
|
|
|
|
2016-01-07 13:51:47 +00:00
|
|
|
T=$(git write-tree) &&
|
2023-05-08 19:01:12 +00:00
|
|
|
git ls-tree -r $T >out &&
|
t: drop "verbose" helper function
We have a small helper function called "verbose", with the idea that you
can write:
verbose foo
to get a message to stderr when the "foo" command fails, even if it does
not produce any output itself. This goes back to 8ad1652418 (t5304: use
helper to report failure of "test foo = bar", 2014-10-10). It does work,
but overall it has not been a big success for two reasons:
1. Test writers have to remember to put it there (and the resulting
test code is longer as a result).
2. It doesn't handle the opposite case (we expect "foo" to fail, but
it succeeds), leading to inconsistencies in tests (which you can
see in many hunks of this patch, e.g. ones involving "has_cr").
Most importantly, we added a136f6d8ff (test-lib.sh: support -x option
for shell-tracing, 2014-10-10) at the same time, and it does roughly the
same thing. The output is not quite as succinct as "verbose", and you
have to watch out for stray shell-traces ending up in stderr. But it
solves both of the problems above, and has clearly become the preferred
tool.
Let's consider the "verbose" function a failed experiment and remove the
last few callers (which are all many years old, and have been dwindling
as we remove them from scripts we touch for other reasons). It will be
one less thing for new test writers to see and wonder if they should be
using themselves.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-05-08 19:04:57 +00:00
|
|
|
grep partA/outline.txt out
|
2006-10-02 05:22:07 +00:00
|
|
|
'
|
|
|
|
|
2006-12-03 19:42:47 +00:00
|
|
|
rm -fr papers partA path?
|
|
|
|
|
|
|
|
test_expect_success "Sergey Vlasov's test case" '
|
|
|
|
rm -fr .git &&
|
2007-01-12 21:01:46 +00:00
|
|
|
git init &&
|
2006-12-03 19:42:47 +00:00
|
|
|
mkdir ab &&
|
|
|
|
date >ab.c &&
|
|
|
|
date >ab/d &&
|
|
|
|
git add ab.c ab &&
|
t: don't spuriously close and reopen quotes
In the test scripts, the recommended style is, e.g.:
test_expect_success 'name' '
do-something somehow &&
do-some-more testing
'
When using this style, any single quote in the multi-line test section
is actually closing the lone single quotes that surround it.
It can be a non-issue in practice:
test_expect_success 'sed a little' '
sed -e 's/hi/lo/' in >out # "ok": no whitespace in s/hi/lo/
'
Or it can be a bug in the test, e.g., because variable interpolation
happens before the test even begins executing:
v=abc
test_expect_success 'variable interpolation' '
v=def &&
echo '"$v"' # abc
'
Change several such in-test single quotes to use double quotes instead
or, in a few cases, drop them altogether. These were identified using
some crude grepping. We're not fixing any test bugs here, but we're
hopefully making these tests slightly easier to grok and to maintain.
There are legitimate use cases for closing a quote and opening a new
one, e.g., both '\'' and '"'"' can be used to produce a literal single
quote. I'm not touching any of those here.
In t9401, tuck the redirecting ">" to the filename while we're touching
those lines.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-08-06 20:08:53 +00:00
|
|
|
git commit -m "initial" &&
|
2006-12-03 19:42:47 +00:00
|
|
|
git mv ab a
|
|
|
|
'
|
|
|
|
|
2021-02-11 19:46:58 +00:00
|
|
|
test_expect_success 'absolute pathname' '
|
|
|
|
(
|
|
|
|
rm -fr mine &&
|
|
|
|
mkdir mine &&
|
|
|
|
cd mine &&
|
|
|
|
test_create_repo one &&
|
|
|
|
cd one &&
|
|
|
|
mkdir sub &&
|
|
|
|
>sub/file &&
|
|
|
|
git add sub/file &&
|
|
|
|
|
|
|
|
git mv sub "$(pwd)/in" &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_missing sub &&
|
|
|
|
test_path_is_dir in &&
|
2021-02-11 19:46:58 +00:00
|
|
|
git ls-files --error-unmatch in/file
|
|
|
|
)
|
|
|
|
'
|
2008-02-04 07:59:17 +00:00
|
|
|
|
2021-02-11 19:46:58 +00:00
|
|
|
test_expect_success 'absolute pathname outside should fail' '
|
|
|
|
(
|
|
|
|
rm -fr mine &&
|
|
|
|
mkdir mine &&
|
|
|
|
cd mine &&
|
|
|
|
out=$(pwd) &&
|
|
|
|
test_create_repo one &&
|
|
|
|
cd one &&
|
|
|
|
mkdir sub &&
|
|
|
|
>sub/file &&
|
|
|
|
git add sub/file &&
|
|
|
|
|
|
|
|
test_must_fail git mv sub "$out/out" &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_dir sub &&
|
|
|
|
test_path_is_missing ../in &&
|
2021-02-11 19:46:58 +00:00
|
|
|
git ls-files --error-unmatch sub/file
|
|
|
|
)
|
|
|
|
'
|
2008-02-04 07:59:17 +00:00
|
|
|
|
2010-01-22 22:17:06 +00:00
|
|
|
test_expect_success 'git mv to move multiple sources into a directory' '
|
|
|
|
rm -fr .git && git init &&
|
|
|
|
mkdir dir other &&
|
|
|
|
>dir/a.txt &&
|
|
|
|
>dir/b.txt &&
|
|
|
|
git add dir/?.txt &&
|
|
|
|
git mv dir/a.txt dir/b.txt other &&
|
|
|
|
git ls-files >actual &&
|
2021-02-11 19:47:03 +00:00
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
other/a.txt
|
|
|
|
other/b.txt
|
|
|
|
EOF
|
2010-01-22 22:17:06 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2008-07-21 00:25:56 +00:00
|
|
|
test_expect_success 'git mv should not change sha1 of moved cache entry' '
|
|
|
|
rm -fr .git &&
|
|
|
|
git init &&
|
|
|
|
echo 1 >dirty &&
|
|
|
|
git add dirty &&
|
2023-05-08 19:01:12 +00:00
|
|
|
entry="$(index_at_path dirty)" &&
|
2008-07-21 00:25:56 +00:00
|
|
|
git mv dirty dirty2 &&
|
2023-05-08 19:01:12 +00:00
|
|
|
test "$entry" = "$(index_at_path dirty2)" &&
|
2008-07-21 00:25:56 +00:00
|
|
|
echo 2 >dirty2 &&
|
|
|
|
git mv dirty2 dirty &&
|
2023-05-08 19:01:12 +00:00
|
|
|
test "$entry" = "$(index_at_path dirty)"
|
2008-07-21 00:25:56 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
rm -f dirty dirty2
|
|
|
|
|
2020-07-20 06:17:52 +00:00
|
|
|
# NB: This test is about the error message
|
|
|
|
# as well as the failure.
|
|
|
|
test_expect_success 'git mv error on conflicted file' '
|
|
|
|
rm -fr .git &&
|
|
|
|
git init &&
|
|
|
|
>conflict &&
|
|
|
|
test_when_finished "rm -f conflict" &&
|
|
|
|
cfhash=$(git hash-object -w conflict) &&
|
|
|
|
q_to_tab <<-EOF | git update-index --index-info &&
|
|
|
|
0 $cfhash 0Qconflict
|
|
|
|
100644 $cfhash 1Qconflict
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_must_fail git mv conflict newname 2>actual &&
|
|
|
|
test_i18ngrep "conflicted" actual
|
|
|
|
'
|
|
|
|
|
2013-06-07 20:53:28 +00:00
|
|
|
test_expect_success 'git mv should overwrite symlink to a file' '
|
2008-07-21 00:25:56 +00:00
|
|
|
rm -fr .git &&
|
|
|
|
git init &&
|
|
|
|
echo 1 >moved &&
|
2013-06-07 20:53:28 +00:00
|
|
|
test_ln_s_add moved symlink &&
|
|
|
|
git add moved &&
|
2008-07-21 00:25:56 +00:00
|
|
|
test_must_fail git mv moved symlink &&
|
|
|
|
git mv -f moved symlink &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_missing moved &&
|
|
|
|
test_path_is_file symlink &&
|
2008-07-21 00:25:56 +00:00
|
|
|
test "$(cat symlink)" = 1 &&
|
2008-07-29 05:27:39 +00:00
|
|
|
git update-index --refresh &&
|
2008-07-21 00:25:56 +00:00
|
|
|
git diff-files --quiet
|
|
|
|
'
|
|
|
|
|
|
|
|
rm -f moved symlink
|
|
|
|
|
2013-06-07 20:53:28 +00:00
|
|
|
test_expect_success 'git mv should overwrite file with a symlink' '
|
2008-07-21 00:25:56 +00:00
|
|
|
rm -fr .git &&
|
|
|
|
git init &&
|
|
|
|
echo 1 >moved &&
|
2013-06-07 20:53:28 +00:00
|
|
|
test_ln_s_add moved symlink &&
|
|
|
|
git add moved &&
|
2008-07-21 00:25:56 +00:00
|
|
|
test_must_fail git mv symlink moved &&
|
|
|
|
git mv -f symlink moved &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_missing symlink &&
|
2008-07-29 05:27:39 +00:00
|
|
|
git update-index --refresh &&
|
2008-07-21 00:25:56 +00:00
|
|
|
git diff-files --quiet
|
|
|
|
'
|
|
|
|
|
2013-06-07 20:53:28 +00:00
|
|
|
test_expect_success SYMLINKS 'check moved symlink' '
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_symlink moved
|
2013-06-07 20:53:28 +00:00
|
|
|
'
|
|
|
|
|
2008-07-21 00:25:56 +00:00
|
|
|
rm -f moved symlink
|
|
|
|
|
2013-07-30 19:49:25 +00:00
|
|
|
test_expect_success 'setup submodule' '
|
2022-07-29 19:21:40 +00:00
|
|
|
test_config_global protocol.file.allow always &&
|
2013-07-30 19:49:25 +00:00
|
|
|
git commit -m initial &&
|
|
|
|
git reset --hard &&
|
|
|
|
git submodule add ./. sub &&
|
|
|
|
echo content >file &&
|
|
|
|
git add file &&
|
2014-03-15 18:56:52 +00:00
|
|
|
git commit -m "added sub and file" &&
|
2016-08-09 08:53:38 +00:00
|
|
|
mkdir -p deep/directory/hierarchy &&
|
|
|
|
git submodule add ./. deep/directory/hierarchy/sub &&
|
2016-04-19 18:32:04 +00:00
|
|
|
git commit -m "added another submodule" &&
|
2014-03-15 18:56:52 +00:00
|
|
|
git branch submodule
|
2013-07-30 19:49:25 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git mv cannot move a submodule in a file' '
|
|
|
|
test_must_fail git mv sub file
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'git mv moves a submodule with a .git directory and no .gitmodules' '
|
2023-05-08 19:01:12 +00:00
|
|
|
entry="$(index_at_path sub)" &&
|
2013-07-30 19:49:25 +00:00
|
|
|
git rm .gitmodules &&
|
|
|
|
(
|
|
|
|
cd sub &&
|
|
|
|
rm -f .git &&
|
2014-04-11 08:24:02 +00:00
|
|
|
cp -R -P -p ../.git/modules/sub .git &&
|
2013-07-30 19:49:25 +00:00
|
|
|
GIT_WORK_TREE=. git config --unset core.worktree
|
|
|
|
) &&
|
|
|
|
mkdir mod &&
|
|
|
|
git mv sub mod/sub &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_missing sub &&
|
2023-05-08 19:01:12 +00:00
|
|
|
test "$entry" = "$(index_at_path mod/sub)" &&
|
2021-02-11 19:47:00 +00:00
|
|
|
git -C mod/sub status &&
|
2013-07-30 19:49:25 +00:00
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --quiet
|
|
|
|
'
|
|
|
|
|
2013-10-13 11:52:05 +00:00
|
|
|
test_expect_success 'git mv moves a submodule with a .git directory and .gitmodules' '
|
|
|
|
rm -rf mod &&
|
|
|
|
git reset --hard &&
|
|
|
|
git submodule update &&
|
2023-05-08 19:01:12 +00:00
|
|
|
entry="$(index_at_path sub)" &&
|
2013-10-13 11:52:05 +00:00
|
|
|
(
|
|
|
|
cd sub &&
|
|
|
|
rm -f .git &&
|
2014-04-11 08:24:02 +00:00
|
|
|
cp -R -P -p ../.git/modules/sub .git &&
|
2013-10-13 11:52:05 +00:00
|
|
|
GIT_WORK_TREE=. git config --unset core.worktree
|
|
|
|
) &&
|
|
|
|
mkdir mod &&
|
|
|
|
git mv sub mod/sub &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_missing sub &&
|
2023-05-08 19:01:12 +00:00
|
|
|
test "$entry" = "$(index_at_path mod/sub)" &&
|
2021-02-11 19:47:00 +00:00
|
|
|
git -C mod/sub status &&
|
2013-10-13 11:52:05 +00:00
|
|
|
echo mod/sub >expected &&
|
|
|
|
git config -f .gitmodules submodule.sub.path >actual &&
|
|
|
|
test_cmp expected actual &&
|
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --quiet
|
|
|
|
'
|
|
|
|
|
2013-07-30 19:50:03 +00:00
|
|
|
test_expect_success 'git mv moves a submodule with gitfile' '
|
2014-09-10 21:01:46 +00:00
|
|
|
rm -rf mod &&
|
2013-07-30 19:50:03 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git submodule update &&
|
2023-05-08 19:01:12 +00:00
|
|
|
entry="$(index_at_path sub)" &&
|
2014-09-10 21:01:46 +00:00
|
|
|
mkdir mod &&
|
2021-02-11 19:47:00 +00:00
|
|
|
git -C mod mv ../sub/ . &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_missing sub &&
|
2023-05-08 19:01:12 +00:00
|
|
|
test "$entry" = "$(index_at_path mod/sub)" &&
|
2021-02-11 19:47:00 +00:00
|
|
|
git -C mod/sub status &&
|
2013-08-06 19:15:11 +00:00
|
|
|
echo mod/sub >expected &&
|
|
|
|
git config -f .gitmodules submodule.sub.path >actual &&
|
|
|
|
test_cmp expected actual &&
|
2013-07-30 19:50:03 +00:00
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --quiet
|
|
|
|
'
|
|
|
|
|
2013-08-06 19:15:11 +00:00
|
|
|
test_expect_success 'mv does not complain when no .gitmodules file is found' '
|
2014-09-10 21:01:46 +00:00
|
|
|
rm -rf mod &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git submodule update &&
|
|
|
|
git rm .gitmodules &&
|
2023-05-08 19:01:12 +00:00
|
|
|
entry="$(index_at_path sub)" &&
|
2014-09-10 21:01:46 +00:00
|
|
|
mkdir mod &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git mv sub mod/sub 2>actual.err &&
|
2018-08-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual.err &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_missing sub &&
|
2023-05-08 19:01:12 +00:00
|
|
|
test "$entry" = "$(index_at_path mod/sub)" &&
|
2021-02-11 19:47:00 +00:00
|
|
|
git -C mod/sub status &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --quiet
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'mv will error out on a modified .gitmodules file unless staged' '
|
2014-09-10 21:01:46 +00:00
|
|
|
rm -rf mod &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git submodule update &&
|
|
|
|
git config -f .gitmodules foo.bar true &&
|
2023-05-08 19:01:12 +00:00
|
|
|
entry="$(index_at_path sub)" &&
|
2014-09-10 21:01:46 +00:00
|
|
|
mkdir mod &&
|
2013-08-06 19:15:11 +00:00
|
|
|
test_must_fail git mv sub mod/sub 2>actual.err &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_file_not_empty actual.err &&
|
|
|
|
test_path_exists sub &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git diff-files --quiet -- sub &&
|
|
|
|
git add .gitmodules &&
|
|
|
|
git mv sub mod/sub 2>actual.err &&
|
2018-08-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual.err &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_missing sub &&
|
2023-05-08 19:01:12 +00:00
|
|
|
test "$entry" = "$(index_at_path mod/sub)" &&
|
2021-02-11 19:47:00 +00:00
|
|
|
git -C mod/sub status &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --quiet
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'mv issues a warning when section is not found in .gitmodules' '
|
2014-09-10 21:01:46 +00:00
|
|
|
rm -rf mod &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git submodule update &&
|
|
|
|
git config -f .gitmodules --remove-section submodule.sub &&
|
|
|
|
git add .gitmodules &&
|
2023-05-08 19:01:12 +00:00
|
|
|
entry="$(index_at_path sub)" &&
|
2013-08-06 19:15:11 +00:00
|
|
|
echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
|
2014-09-10 21:01:46 +00:00
|
|
|
mkdir mod &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git mv sub mod/sub 2>actual.err &&
|
2021-02-11 01:53:53 +00:00
|
|
|
test_cmp expect.err actual.err &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_missing sub &&
|
2023-05-08 19:01:12 +00:00
|
|
|
test "$entry" = "$(index_at_path mod/sub)" &&
|
2021-02-11 19:47:00 +00:00
|
|
|
git -C mod/sub status &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --quiet
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'mv --dry-run does not touch the submodule or .gitmodules' '
|
2014-09-10 21:01:46 +00:00
|
|
|
rm -rf mod &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git reset --hard &&
|
|
|
|
git submodule update &&
|
2014-09-10 21:01:46 +00:00
|
|
|
mkdir mod &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git mv -n sub mod/sub 2>actual.err &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_file sub/.git &&
|
2013-08-06 19:15:11 +00:00
|
|
|
git diff-index --exit-code HEAD &&
|
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --quiet -- sub .gitmodules
|
|
|
|
'
|
|
|
|
|
2014-01-07 21:31:32 +00:00
|
|
|
test_expect_success 'checking out a commit before submodule moved needs manual updates' '
|
|
|
|
git mv sub sub2 &&
|
|
|
|
git commit -m "moved sub to sub2" &&
|
|
|
|
git checkout -q HEAD^ 2>actual &&
|
2017-11-01 14:44:44 +00:00
|
|
|
test_i18ngrep "^warning: unable to rmdir '\''sub2'\'':" actual &&
|
2014-01-07 21:31:32 +00:00
|
|
|
git status -s sub2 >actual &&
|
|
|
|
echo "?? sub2/" >expected &&
|
|
|
|
test_cmp expected actual &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_missing sub/.git &&
|
|
|
|
test_path_is_file sub2/.git &&
|
2014-01-07 21:31:32 +00:00
|
|
|
git submodule update &&
|
2022-11-04 15:05:52 +00:00
|
|
|
test_path_is_file sub/.git &&
|
2014-01-07 21:31:32 +00:00
|
|
|
rm -rf sub2 &&
|
|
|
|
git diff-index --exit-code HEAD &&
|
|
|
|
git update-index --refresh &&
|
|
|
|
git diff-files --quiet -- sub .gitmodules &&
|
|
|
|
git status -s sub2 >actual &&
|
2018-08-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual
|
2014-01-07 21:31:32 +00:00
|
|
|
'
|
|
|
|
|
2014-03-15 18:56:52 +00:00
|
|
|
test_expect_success 'mv -k does not accidentally destroy submodules' '
|
|
|
|
git checkout submodule &&
|
|
|
|
mkdir dummy dest &&
|
|
|
|
git mv -k dummy sub dest &&
|
|
|
|
git status --porcelain >actual &&
|
|
|
|
grep "^R sub -> dest/sub" actual &&
|
|
|
|
git reset --hard &&
|
|
|
|
git checkout .
|
|
|
|
'
|
|
|
|
|
2016-04-19 18:32:04 +00:00
|
|
|
test_expect_success 'moving a submodule in nested directories' '
|
|
|
|
(
|
|
|
|
cd deep &&
|
|
|
|
git mv directory ../ &&
|
|
|
|
# git status would fail if the update of linking git dir to
|
|
|
|
# work dir of the submodule failed.
|
|
|
|
git status &&
|
2016-08-09 08:53:38 +00:00
|
|
|
git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
|
|
|
|
echo "directory/hierarchy/sub" >../expect
|
2016-04-19 18:32:04 +00:00
|
|
|
) &&
|
2017-10-06 19:00:06 +00:00
|
|
|
test_cmp expect actual
|
2016-04-19 18:32:04 +00:00
|
|
|
'
|
|
|
|
|
2018-03-28 22:35:31 +00:00
|
|
|
test_expect_success 'moving nested submodules' '
|
2022-07-29 19:21:40 +00:00
|
|
|
test_config_global protocol.file.allow always &&
|
2017-09-15 11:50:21 +00:00
|
|
|
git commit -am "cleanup commit" &&
|
|
|
|
mkdir sub_nested_nested &&
|
2021-02-11 19:46:58 +00:00
|
|
|
(
|
|
|
|
cd sub_nested_nested &&
|
2021-02-11 19:47:01 +00:00
|
|
|
>nested_level2 &&
|
2017-09-15 11:50:21 +00:00
|
|
|
git init &&
|
|
|
|
git add . &&
|
|
|
|
git commit -m "nested level 2"
|
|
|
|
) &&
|
|
|
|
mkdir sub_nested &&
|
2021-02-11 19:46:58 +00:00
|
|
|
(
|
|
|
|
cd sub_nested &&
|
2021-02-11 19:47:01 +00:00
|
|
|
>nested_level1 &&
|
2017-09-15 11:50:21 +00:00
|
|
|
git init &&
|
|
|
|
git add . &&
|
2018-07-02 00:24:03 +00:00
|
|
|
git commit -m "nested level 1" &&
|
2017-09-15 11:50:21 +00:00
|
|
|
git submodule add ../sub_nested_nested &&
|
|
|
|
git commit -m "add nested level 2"
|
|
|
|
) &&
|
|
|
|
git submodule add ./sub_nested nested_move &&
|
|
|
|
git commit -m "add nested_move" &&
|
|
|
|
git submodule update --init --recursive &&
|
|
|
|
git mv nested_move sub_nested_moved &&
|
|
|
|
git status
|
|
|
|
'
|
|
|
|
|
2005-11-29 22:10:24 +00:00
|
|
|
test_done
|