]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge branch 'fix--mktemp_on_OSX'
authorRichard Hartmann <richih@debian.org>
Tue, 10 Sep 2013 14:14:35 +0000 (16:14 +0200)
committerRichard Hartmann <richih@debian.org>
Tue, 10 Sep 2013 14:14:35 +0000 (16:14 +0200)
vcsh

diff --git a/vcsh b/vcsh
index 508c087a9aae50fb7736b5e0ddefb2ef6fe33dbf..d6ee234a2ebd26e4ca10360f44701f304eefb1e4 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -365,7 +365,11 @@ write_gitignore() {
                        file="$new"
                done;
        done | sort -u)
-       tempfile=$(mktemp) || fatal "could not create tempfile" 51
+
+       # Contrary to GNU mktemp, mktemp on BSD/OSX requires a template for temp files
+       # Use the template GNU mktemo defaults to
+       tempfile=$(mktemp tmp.XXXXXXXXXX) || fatal "could not create tempfile" 51
+
        echo '*' > "$tempfile" || fatal "could not write to '$tempfile'" 57
        for gitignore in $gitignores; do
                echo "$gitignore" | sed 's@^@!/@' >> "$tempfile" || fatal "could not write to '$tempfile'" 57