Merge branch 'ak/t4204-shell-portability'

Update a test to run also under ksh88.

* ak/t4204-shell-portability:
  t4204: do not let $name variable clobbered
This commit is contained in:
Junio C Hamano 2016-05-29 18:06:43 -07:00
commit b586d8c733

View file

@ -30,11 +30,11 @@ test_expect_success 'patch-id output is well-formed' '
#calculate patch id. Make sure output is not empty. #calculate patch id. Make sure output is not empty.
calc_patch_id () { calc_patch_id () {
name="$1" patch_name="$1"
shift shift
git patch-id "$@" | git patch-id "$@" |
sed "s/ .*//" >patch-id_"$name" && sed "s/ .*//" >patch-id_"$patch_name" &&
test_line_count -gt 0 patch-id_"$name" test_line_count -gt 0 patch-id_"$patch_name"
} }
get_top_diff () { get_top_diff () {