Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
difftool: Call the temp directory "git-difftool"
author
David Aguilar
<davvid@gmail.com>
Mon, 23 Jul 2012 03:57:10 +0000
(20:57 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 23 Jul 2012 04:43:04 +0000
(21:43 -0700)
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>
git-difftool.perl
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
c9bdd50
)
diff --git
a/git-difftool.perl
b/git-difftool.perl
index 0ce616840796b5c44d7d7d1f3b2a3a334999f306..2ae344c7f4c4e81d95656caba7eba7feec15a206 100755
(executable)
--- 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-diff
al
l.XXXXX', CLEANUP => 1, TMPDIR => 1);
+ my $tmpdir = tempdir('git-diff
too
l.XXXXX', CLEANUP => 1, TMPDIR => 1);
my $ldir = "$tmpdir/left";
my $rdir = "$tmpdir/right";
mkpath($ldir) or die $!;