summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-29 18:06:43 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-29 18:06:43 -0700
commitb586d8c733cee142b5b986886e610b09f6f03897 (patch)
tree9a046d59e10e574146c15efbcf4d6ba78ccb0caf
parent5b67f9a02854799a4c7863503c96fd0ae9f883bb (diff)
parent5c63920190b38f4ea92d5b0104d3697a34f5f2b3 (diff)
downloadgit-b586d8c733cee142b5b986886e610b09f6f03897.tar.gz
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
-rwxr-xr-xt/t4204-patch-id.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index baa9d3c82e..84a809690e 100755
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
@@ -30,11 +30,11 @@ test_expect_success 'patch-id output is well-formed' '
#calculate patch id. Make sure output is not empty.
calc_patch_id () {
- name="$1"
+ patch_name="$1"
shift
git patch-id "$@" |
- sed "s/ .*//" >patch-id_"$name" &&
- test_line_count -gt 0 patch-id_"$name"
+ sed "s/ .*//" >patch-id_"$patch_name" &&
+ test_line_count -gt 0 patch-id_"$patch_name"
}
get_top_diff () {