From: David Aguilar <davvid@gmail.com>
Date: Mon, 23 Jul 2012 03:57:10 +0000 (-0700)
Subject: difftool: Call the temp directory "git-difftool"
X-Git-Tag: v1.8.0-rc0~129^2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b965e8f44ad76a810c60406d01b45b87d6ac2701;p=git.git

difftool: Call the temp directory "git-difftool"

The "diffall" name was left over from when this functionality was part of
the "git-diffall" script in contrib/.  Make the naming consistent.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-difftool.perl b/git-difftool.perl
index 0ce616840..2ae344c7f 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -104,7 +104,7 @@ sub setup_dir_diff
 	exit(0) if (length($diffrtn) == 0);
 
 	# Setup temp directories
-	my $tmpdir = tempdir('git-diffall.XXXXX', CLEANUP => 1, TMPDIR => 1);
+	my $tmpdir = tempdir('git-difftool.XXXXX', CLEANUP => 1, TMPDIR => 1);
 	my $ldir = "$tmpdir/left";
 	my $rdir = "$tmpdir/right";
 	mkpath($ldir) or die $!;