Michał Kiedrowicz <michal.kiedrowicz@xxxxxxxxx> writes:
> Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@xxxxxxxxx>
> ---
> t/t4130-apply-criss-cross-rename.sh | 35 +++++++++++++++++++++++++++++++++++
> 1 files changed, 35 insertions(+), 0 deletions(-)
> create mode 100755 t/t4130-apply-criss-cross-rename.sh
>
> diff --git a/t/t4130-apply-criss-cross-rename.sh b/t/t4130-apply-criss-cross-rename.sh
> new file mode 100755
> index 0000000..30187ff
> --- /dev/null
> +++ b/t/t4130-apply-criss-cross-rename.sh
> @@ -0,0 +1,35 @@
> +#!/bin/sh
> +
> +test_description='git apply handling criss-cross rename patch.'
> +. ./test-lib.sh
> +
> +create_file() {
> + for ((i=0; i<100; i++)); do
Please don't; isn't this a bashism?
> + echo "$2" >> "$1"
> + done
> +}
> +
> +test_expect_success 'setup' '
> + create_file file1 "File1 contents" &&
> + create_file file2 "File2 contents" &&
> + git add file1 file2 &&
> + git commit -m 1
> +'
> +
> +test_expect_success 'criss-cross rename' '
> + mv file1 tmp &&
> + mv file2 file1 &&
> + mv tmp file2
> +'
> +
> +test_expect_success 'diff -M -B' '
> + git diff -M -B > diff &&
> + git reset --hard
> +
> +'
> +
> +test_expect_failure 'apply' '
> + git apply diff
> +'
> +
> +test_done
> --
> 1.6.0.6
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html