Re: [PATCH] Add new testcases for format-patch root commits
- From
- Alexander Potashev <aspotashev@gmail.com>
- Date
- Jan 10, 2009, 18:33 UTC
- Message-ID
- <20090110183339.GA30548@myhost>
- In-Reply-To
- <1231605577-26148-1-git-send-email-aspotashev@gmail.com>
On 19:39 Sat 10 Jan , Alexander Potashev wrote:
Show 9 quoted lines
> 1. format-patch'ing root commit shouldn't create empty patches > 2. With --root it should create a patch for the root commit > 3. Similar testcases with two commits in the tree > > Signed-off-by: Alexander Potashev <aspotashev@gmail.com> > --- > > git format-patch lacks a '--no-root' option, so I used > 'git config log.showroot false' to emulate it.
Sorry, --root option has nothing in common with log.showroot, but the testcases are still valid.
Show 68 quoted lines
>
>
>
> t/t4033-format-patch-root-commit.sh | 52 +++++++++++++++++++++++++++++++++++
> 1 files changed, 52 insertions(+), 0 deletions(-)
> create mode 100755 t/t4033-format-patch-root-commit.sh
>
> diff --git a/t/t4033-format-patch-root-commit.sh b/t/t4033-format-patch-root-commit.sh
> new file mode 100755
> index 0000000..846c11c
> --- /dev/null
> +++ b/t/t4033-format-patch-root-commit.sh
> @@ -0,0 +1,52 @@
> +#!/bin/sh
> +
> +test_description='Format-patch root commit skipping/allowing'
> +
> +. ./test-lib.sh
> +
> +test_expect_success setup '
> + git config log.showroot false
> + git config format.numbered false
> + echo A > file &&
> + git add file &&
> + git commit -m First
> +'
> +
> +test_patch_count() {
> + cnt=$(grep "^Subject: \[PATCH\]" $1 | wc -l) &&
> + test $cnt = $2
> +}
> +
> +test_patch_is_single() {
> + cnt=$(grep "^Subject: \[PATCH\] $2" $1 | wc -l) &&
> + test $cnt = 1
> +}
> +
> +test_expect_success 'format-patch root commit with showroot = false' '
> + git format-patch -1 &&
> + test_must_fail cat 0001-First.patch
> +'
> +
> +test_expect_success 'format-patch root commit' '
> + git format-patch --root --stdout -5 >root-only.patch &&
> + test_patch_count root-only.patch 1 &&
> + test_patch_is_single root-only.patch First
> +'
> +
> +test_expect_success 'format-patch 2 commits without root' '
> + echo B > file &&
> + git commit -a -m Second &&
> +
> + git format-patch --stdout -2 >two-except-root.patch &&
> + test_patch_count two-except-root.patch 1 &&
> + test_patch_is_single two-except-root.patch Second
> +'
> +
> +test_expect_success 'format-patch 2 commits including root' '
> + git format-patch --root --stdout -2 >two-with-root.patch &&
> + test_patch_count two-with-root.patch 2 &&
> + test_patch_is_single two-with-root.patch First &&
> + test_patch_is_single two-with-root.patch Second
> +'
> +
> +test_done
> --
> 1.6.1.81.g61cf1
>