Merge branch 'lf/sideband-returns-void' into maint

diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index baa9d3c82e8a54dc7501d90bc9da0527f2a72b2e..84a809690e786c1278d0885b4b441c6ce3bbe4f0 100755 (executable)
--- 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 () {