Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'

diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index 1aee4835105afa8658536120892b63580b36f462..bd8efaf005a9708f153ea873850acca994c64f29 100755 (executable)
--- 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"
 }