Skip to content

Commit 853563d

Browse files
committed
Merge branch 'maint'
* maint: t0050: fix printf format strings for portability t3419-*.sh: Fix arithmetic expansion syntax error
2 parents 6ae7a51 + 77e5726 commit 853563d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

t/t0050-filesystem.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ test_description='Various filesystem issues'
44

55
. ./test-lib.sh
66

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

1010
case_insensitive=
1111
unibad=

t/t3419-rebase-patch-id.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/bin/bash
1+
#!/bin/sh
22

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

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

0 commit comments

Comments
 (0)