2009-07-11 03:38:08 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2009 Junio C Hamano
|
|
|
|
|
|
|
|
|
|
test_description='git-apply notices removal patches generated by GNU diff'
|
|
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
|
cat <<-EOF >c &&
|
|
|
|
|
diff -ruN a/file b/file
|
|
|
|
|
--- a/file TS0
|
|
|
|
|
+++ b/file TS1
|
|
|
|
|
@@ -0,0 +1 @@
|
|
|
|
|
+something
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat <<-EOF >d &&
|
|
|
|
|
diff -ruN a/file b/file
|
|
|
|
|
--- a/file TS0
|
|
|
|
|
+++ b/file TS1
|
|
|
|
|
@@ -1 +0,0 @@
|
|
|
|
|
-something
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
timeWest="1982-09-16 07:00:00.000000000 -0800" &&
|
|
|
|
|
timeGMT="1982-09-16 15:00:00.000000000 +0000" &&
|
|
|
|
|
timeEast="1982-09-17 00:00:00.000000000 +0900" &&
|
|
|
|
|
|
|
|
|
|
epocWest="1969-12-31 16:00:00.000000000 -0800" &&
|
|
|
|
|
epocGMT="1970-01-01 00:00:00.000000000 +0000" &&
|
|
|
|
|
epocEast="1970-01-01 09:00:00.000000000 +0900" &&
|
2010-09-29 22:49:49 +02:00
|
|
|
epocWest2="1969-12-31 16:00:00 -08:00" &&
|
2009-07-11 03:38:08 +02:00
|
|
|
|
|
|
|
|
sed -e "s/TS0/$epocWest/" -e "s/TS1/$timeWest/" <c >createWest.patch &&
|
|
|
|
|
sed -e "s/TS0/$epocEast/" -e "s/TS1/$timeEast/" <c >createEast.patch &&
|
|
|
|
|
sed -e "s/TS0/$epocGMT/" -e "s/TS1/$timeGMT/" <c >createGMT.patch &&
|
|
|
|
|
|
|
|
|
|
sed -e "s/TS0/$timeWest/" -e "s/TS1/$timeWest/" <c >addWest.patch &&
|
|
|
|
|
sed -e "s/TS0/$timeEast/" -e "s/TS1/$timeEast/" <c >addEast.patch &&
|
|
|
|
|
sed -e "s/TS0/$timeGMT/" -e "s/TS1/$timeGMT/" <c >addGMT.patch &&
|
|
|
|
|
|
|
|
|
|
sed -e "s/TS0/$timeWest/" -e "s/TS1/$timeWest/" <d >emptyWest.patch &&
|
|
|
|
|
sed -e "s/TS0/$timeEast/" -e "s/TS1/$timeEast/" <d >emptyEast.patch &&
|
|
|
|
|
sed -e "s/TS0/$timeGMT/" -e "s/TS1/$timeGMT/" <d >emptyGMT.patch &&
|
|
|
|
|
|
|
|
|
|
sed -e "s/TS0/$timeWest/" -e "s/TS1/$epocWest/" <d >removeWest.patch &&
|
|
|
|
|
sed -e "s/TS0/$timeEast/" -e "s/TS1/$epocEast/" <d >removeEast.patch &&
|
|
|
|
|
sed -e "s/TS0/$timeGMT/" -e "s/TS1/$epocGMT/" <d >removeGMT.patch &&
|
2010-09-29 22:49:49 +02:00
|
|
|
sed -e "s/TS0/$timeWest/" -e "s/TS1/$epocWest2/" <d >removeWest2.patch &&
|
2009-07-11 03:38:08 +02:00
|
|
|
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
echo something >something
|
2009-07-11 03:38:08 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
for patch in *.patch
|
|
|
|
|
do
|
|
|
|
|
test_expect_success "test $patch" '
|
|
|
|
|
rm -f file .git/index &&
|
|
|
|
|
case "$patch" in
|
|
|
|
|
create*)
|
|
|
|
|
# must be able to create
|
|
|
|
|
git apply --index $patch &&
|
|
|
|
|
test_cmp file something &&
|
|
|
|
|
# must notice the file is already there
|
|
|
|
|
>file &&
|
|
|
|
|
git add file &&
|
|
|
|
|
test_must_fail git apply $patch
|
|
|
|
|
;;
|
|
|
|
|
add*)
|
|
|
|
|
# must be able to create or patch
|
|
|
|
|
git apply $patch &&
|
|
|
|
|
test_cmp file something &&
|
|
|
|
|
>file &&
|
|
|
|
|
git apply $patch &&
|
|
|
|
|
test_cmp file something
|
|
|
|
|
;;
|
|
|
|
|
empty*)
|
|
|
|
|
# must leave an empty file
|
|
|
|
|
cat something >file &&
|
|
|
|
|
git add file &&
|
|
|
|
|
git apply --index $patch &&
|
|
|
|
|
test -f file &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 23:57:25 +02:00
|
|
|
test_must_be_empty file
|
2009-07-11 03:38:08 +02:00
|
|
|
;;
|
|
|
|
|
remove*)
|
|
|
|
|
# must remove the file
|
|
|
|
|
cat something >file &&
|
|
|
|
|
git add file &&
|
|
|
|
|
git apply --index $patch &&
|
|
|
|
|
! test -f file
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
'
|
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
test_done
|