Alexey Shumkin <[email protected]> writes:
> The expected SHA-1 digests are always available in variables. Use
> them instead of hardcoding.
>
> Signed-off-by: Alexey Shumkin <[email protected]>
> ---
> t/t6006-rev-list-format.sh | 142
> +++++++++++++++++++++++++--------------------
> 1 file changed, 79 insertions(+), 63 deletions(-)
>
> diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
> index 0393c9f..d32e65e 100755
> --- a/t/t6006-rev-list-format.sh
> +++ b/t/t6006-rev-list-format.sh
> @@ -7,8 +7,21 @@ test_description='git rev-list --pretty=format test'
>
> test_tick
> test_expect_success 'setup' '
> -touch foo && git add foo && git commit -m "added foo" &&
> - echo changed >foo && git commit -a -m "changed foo"
> + : >foo &&
> + git add foo &&
> + git commit -m "added foo" &&
> + head1=$(git rev-parse --verify HEAD) &&
> + head1_short=$(git rev-parse --short $head1) &&
> + tree1=$(git cat-file commit HEAD | sed -n -e "s/^tree //p" -e "/^$/q")
> &&
> + tree1_short=$(git rev-parse --short $tree1) &&
> + echo changed >foo &&
> + git commit -a -m "changed foo" &&
> + head2=$(git rev-parse --verify HEAD) &&
> + head2_short=$(git rev-parse --short $head2) &&
> + head2_parent=$(git cat-file commit HEAD | sed -n -e "s/^parent //p" -e
> "/^$/q") &&
> + head2_parent_short=$(git rev-parse --short $head2_parent) &&
> + tree2=$(git cat-file commit HEAD | sed -n -e "s/^tree //p" -e "/^$/q")
> &&
With modern Git, you can (and would) write this as
tree2=$(git rev-parse HEAD:)
(the same for tree1). Other than that, looks sensible.
Will queue with a tweak.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
