Merge commit 'refs/pull/14909/head' of git://github.com/NixOS/nixpkgs into staging

+2 -2
+2 -2
pkgs/build-support/fetchgit/nix-prefetch-git
··· 343 343 344 344 if test -n "$builder"; then 345 345 test -n "$out" -a -n "$url" -a -n "$rev" || usage 346 - mkdir $out 346 + mkdir -p $out 347 347 clone_user_rev "$out" "$url" "$rev" 348 348 else 349 349 if test -z "$hashType"; then ··· 368 368 trap "rm -rf \"$tmpPath\"" EXIT 369 369 370 370 tmpFile="$tmpPath/$(url_to_name "$url" "$rev")" 371 - mkdir "$tmpFile" 371 + mkdir -p "$tmpFile" 372 372 373 373 # Perform the checkout. 374 374 clone_user_rev "$tmpFile" "$url" "$rev"