David Aguilar <davvid@xxxxxxxxx> writes:
> 105b5d3fbb1c00bb0aeaf9d3e0fbe26a7b1993fc introduced a dependency
> on mkdtemp, which is not available on Windows.
>
> Use the original temporary directory behavior when mkdtemp fails.
> This makes the code use mkdtemp when available and gracefully
> fallback to the existing behavior when it is not available.
>
> Helped-by: Junio C Hamano <gitster@xxxxxxxxx>
> Helped-by: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: David Aguilar <davvid@xxxxxxxxx>
> ---
Does this still need to be applied before I can pull from Paulus?
> gitk | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/gitk b/gitk
> index 41e5071..9237830 100755
> --- a/gitk
> +++ b/gitk
> @@ -3504,7 +3504,9 @@ proc gitknewtmpdir {} {
> set tmpdir $gitdir
> }
> set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"]
> - set gitktmpdir [exec mktemp -d $gitktmpformat]
> + if {[catch {set gitktmpdir [exec mktemp -d $gitktmpformat]}]} {
> + set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
> + }
> if {[catch {file mkdir $gitktmpdir} err]} {
> error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
> unset gitktmpdir
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html