Merge branch 'maint'

* maint:
  t0050: fix printf format strings for portability
  t3419-*.sh: Fix arithmetic expansion syntax error
This commit is contained in:
Junio C Hamano 2010-12-21 14:45:28 -08:00
commit 853563d734
2 changed files with 4 additions and 4 deletions

View File

@ -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=

View File

@ -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"
}