Fix github-merge with git version 2.1.0

Running git version 2.1.0 on OSX (homebrew), I get fatal: '1q': not a non-negative integer I'm guessing git command-line parsing got more strict recently?
TrezarCoin · Aug 19, 2014 · c53b1ec · c53b1ec
1 parent 335e3a5
commit c53b1ec
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/contrib/devtools/github-merge.sh b/contrib/devtools/github-merge.sh
@@ -49,11 +49,11 @@ fi
 # Initialize source branches.
 git checkout -q "$BRANCH"
 if git fetch -q "$HOST":"$REPO" "+refs/pull/$PULL/*:refs/heads/pull/$PULL/*"; then
-  if ! git log -1q "refs/heads/pull/$PULL/head" >/dev/null 2>&1; then
+  if ! git log -q -1 "refs/heads/pull/$PULL/head" >/dev/null 2>&1; then
     echo "ERROR: Cannot find head of pull request #$PULL on $HOST:$REPO." >&2
     exit 3
   fi
-  if ! git log -1q "refs/heads/pull/$PULL/merge" >/dev/null 2>&1; then
+  if ! git log -q -1 "refs/heads/pull/$PULL/merge" >/dev/null 2>&1; then
     echo "ERROR: Cannot find merge of pull request #$PULL on $HOST:$REPO." >&2
     exit 3
   fi