Merge branch 'maint'

* maint:
t0050: fix printf format strings for portability
t3419-*.sh: Fix arithmetic expansion syntax error

diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 057c97c49f26c354e25675e4489c0e94917de33f..1542cf6a1313963fccdf42702c620be9e05f7143 100755 (executable)
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -4,8 +4,8 @@ test_description='Various filesystem issues'
 
 . ./test-lib.sh
 
-auml=`printf '\xc3\xa4'`
-aumlcdiar=`printf '\x61\xcc\x88'`
+auml=$(printf '\303\244')
+aumlcdiar=$(printf '\141\314\210')
 
 case_insensitive=
 unibad=

diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index 1aee4835105afa8658536120892b63580b36f462..bd8efaf005a9708f153ea873850acca994c64f29 100755 (executable)
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 test_description='git rebase - test patch id computation'
 
@@ -27,7 +27,7 @@ scramble()
                then
                        echo "$x"
                fi
-               i=$(((i+1) % 10))
+               i=$((($i+1) % 10))
        done < "$1" > "$1.new"
        mv -f "$1.new" "$1"
 }