Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'maint'

* maint:
  t0050: fix printf format strings for portability
  t3419-*.sh: Fix arithmetic expansion syntax error
  • Loading branch information...
commit 853563d7344ee532aa56f8a9aabcfdfb5c4fe2c3 2 parents 6ae7a51 + 77e5726
Junio C Hamano gitster authored
Showing with 4 additions and 4 deletions.
  1. +2 −2 t/t0050-filesystem.sh
  2. +2 −2 t/t3419-rebase-patch-id.sh
4 t/t0050-filesystem.sh
View
@@ -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=
4 t/t3419-rebase-patch-id.sh
View
@@ -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"
}
Please sign in to comment.
Something went wrong with that request. Please try again.