From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Tim Henigan <tim.henigan@gmail.com>, git@vger.kernel.org
Subject: [PATCH v4 4/5] difftool: Call the temp directory "git-difftool"
Date: Tue, 24 Jul 2012 19:59:32 -0700 [thread overview]
Message-ID: <1343185173-48278-5-git-send-email-davvid@gmail.com> (raw)
In-Reply-To: <1343185173-48278-1-git-send-email-davvid@gmail.com>
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>
---
Same as last time, rebased
git-difftool.perl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-difftool.perl b/git-difftool.perl
index 685887d..b4f2fc6 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -119,7 +119,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 $!;
--
1.7.12.rc0.15.g8157c39
next prev parent reply other threads:[~2012-07-25 2:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-25 2:59 [PATCH v4 0/5] difftool: Use symlinks in dir-diff mode David Aguilar
2012-07-25 2:59 ` [PATCH v4 1/5] difftool: print_tool_help() globals David Aguilar
2012-07-25 2:59 ` [PATCH v4 2/5] difftool: Eliminate global variables David Aguilar
2012-07-25 2:59 ` [PATCH v4 3/5] difftool: Move option values into a hash David Aguilar
2012-07-25 2:59 ` David Aguilar [this message]
2012-07-25 2:59 ` [PATCH v4 5/5] difftool: Use symlinks when diffing against the worktree David Aguilar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343185173-48278-5-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tim.henigan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).