Browse Source

Merge branch 'maint'

* maint:
  t0050: fix printf format strings for portability
  t3419-*.sh: Fix arithmetic expansion syntax error
maint
Junio C Hamano 14 years ago
parent
commit
853563d734
  1. 4
      t/t0050-filesystem.sh
  2. 4
      t/t3419-rebase-patch-id.sh

4
t/t0050-filesystem.sh

@ -4,8 +4,8 @@ test_description='Various filesystem issues'


. ./test-lib.sh . ./test-lib.sh


auml=`printf '\xc3\xa4'` auml=$(printf '\303\244')
aumlcdiar=`printf '\x61\xcc\x88'` aumlcdiar=$(printf '\141\314\210')


case_insensitive= case_insensitive=
unibad= unibad=

4
t/t3419-rebase-patch-id.sh

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/sh


test_description='git rebase - test patch id computation' test_description='git rebase - test patch id computation'


@ -27,7 +27,7 @@ scramble()
then then
echo "$x" echo "$x"
fi fi
i=$(((i+1) % 10)) i=$((($i+1) % 10))
done < "$1" > "$1.new" done < "$1" > "$1.new"
mv -f "$1.new" "$1" mv -f "$1.new" "$1"
} }

Loading…
Cancel
Save