summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-21 14:45:28 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-21 14:45:28 -0800
commit853563d7344ee532aa56f8a9aabcfdfb5c4fe2c3 (patch)
tree8846fccf9892990d1c0e2ee4c8fb8adb918c08ec
parentMerge branch 'ks/blame-worktree-textconv-cached' (diff)
parentt0050: fix printf format strings for portability (diff)
downloadtgif-853563d7344ee532aa56f8a9aabcfdfb5c4fe2c3.tar.xz
Merge branch 'maint'
* maint: t0050: fix printf format strings for portability t3419-*.sh: Fix arithmetic expansion syntax error
-rwxr-xr-xt/t0050-filesystem.sh4
-rwxr-xr-xt/t3419-rebase-patch-id.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 057c97c49f..1542cf6a13 100755
--- 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 1aee483510..bd8efaf005 100755
--- 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"
}