Skip to content
Snippets Groups Projects
Commit 1feadff3 authored by totten's avatar totten
Browse files

merge-forward: Fix for OS X mktemp

parent 767910a2
No related branches found
No related tags found
No related merge requests found
......@@ -19,7 +19,10 @@ if [ -z "$RELPATH" -o -z "$REMOTE" -o -z "$MAINTBRANCH" -o -z "$DEVBRANCH" ]
fi
pushd "$RELPATH" >> /dev/null
TMPFILE=$(mktemp)
## OS X: mktemp requires "-t prefix" argument
## GNU: mktemp accepts optional -t pattern" argument
## The string "merge-forward-XXXXXX" works as a prefix or pattern
TMPFILE=$(mktemp -t merge-forward-XXXXXX)
set -x
git fetch $REMOTE
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment