test: Harden 'rm', 'init' usage

Separate options and args with --.

Change-Id: I858f09e5eaed4b1e90639aca58e338aec3f34454

test/test_batch_merge.sh

diff --git a/test/test_batch_merge.sh b/test/test_batch_merge.sh
index cb7bc67..60856fd 100755
--- a/test/test_batch_merge.sh
+++ b/test/test_batch_merge.sh
@@ -119,7 +119,7 @@
 }
 
 cleanup() { # [error_message]
-    rm -rf "$REPO_DIR"
+    rm -rf -- "$REPO_DIR"
 
     if [ -n "$1" ] ; then
         echo "$1, unable to perform batch tests" >&2
@@ -176,7 +176,7 @@
 
 REPO_DIR=$(mktemp -d)
 trap cleanup EXIT
-q git init "$REPO_DIR"
+q git init -- "$REPO_DIR"
 
 GIT_DIR="$REPO_DIR/.git"
 HOOK_DIR="$GIT_DIR/hooks"