[PATCH] send-email: allow send-email to run outside a repo

[PATCH] send-email: allow send-email to run outside a repo

[Jay Soffian]

From: Jay Soffian <jaysoffian@gmail.com>

send-email is supposed to be able to run from outside a repo. This
ability was broken by commits caf0c3d6 (make the message file name more
specific) and 5df9fcf6 (interpret unknown files as revision lists).

This commit provides a fix for both.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
---
Junio,

This is on top of my previous send-email commits from tonight. I'm not
sure whether it applies cleanly otherwise.

j.

 git-send-email.perl |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/git-send-email.perl b/git-send-email.perl
index 23a55e2..49ed8c2 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -23,7 +23,7 @@ use Getopt::Long;
 use Text::ParseWords;
 use Data::Dumper;
 use Term::ANSIColor;
-use File::Temp qw/ tempdir /;
+use File::Temp qw/ tempdir tempfile /;
 use Error qw(:try);
 use Git;
 
@@ -157,7 +157,10 @@ if ($@) {
 # Behavior modification variables
 my ($quiet, $dry_run) = (0, 0);
 my $format_patch;
-my $compose_filename = $repo->repo_path() . "/.gitsendemail.msg.$$";
+my $compose_filename = ($repo ?
+	tempfile(".gitsendemail.msg.XXXXXX", DIR => $repo->repo_path()) :
+	tempfile(".gitsendemail.msg.XXXXXX", DIR => "."))[1];
+
 
 # Handle interactive edition of files.
 my $multiedit;
@@ -268,6 +271,9 @@ unless ($rc) {
     usage();
 }
 
+die "Cannot run git format-patch from outside a repository\n"
+	if $format_patch and not $repo;
+
 # Now, let's fill any that aren't set in with defaults:
 
 sub read_config {
@@ -420,6 +426,7 @@ if (@alias_files and $aliasfiletype and defined $parse_alias{$aliasfiletype}) {
 
 # returns 1 if the conflict must be solved using it as a format-patch argument
 sub check_file_rev_conflict($) {
+	return unless $repo;
 	my $f = shift;
 	try {
 		$repo->command('rev-parse', '--verify', '--quiet', $f);
@@ -461,6 +468,8 @@ while (defined(my $f = shift @ARGV)) {
 }
 
 if (@rev_list_opts) {
+	die "Cannot run git format-patch from outside a repository\n"
+		unless $repo;
 	push @files, $repo->command('format-patch', '-o', tempdir(CLEANUP => 1), @rev_list_opts);
 }
 
-- 
1.6.2.rc0.238.g0c1fe

Re: [PATCH] send-email: allow send-email to run outside a repo

[Junio C Hamano]

Jay Soffian <jaysoffian@gmail.com> writes:

> This is on top of my previous send-email commits from tonight. I'm not
> sure whether it applies cleanly otherwise.

I think unlike the --suppress-cc ones that are about changing semantics
(and it does not matter "to a much saner one"), this is a fix that is more
important for the upcoming release.  Splitting Cc list and folding headers
also fall into the same category, I think.

I'd prefer a rebased series to have fixes first and then enhancements.

Thanks.

Re: [PATCH] send-email: allow send-email to run outside a repo

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

> Jay Soffian <jaysoffian@gmail.com> writes:
>
>> This is on top of my previous send-email commits from tonight. I'm not
>> sure whether it applies cleanly otherwise.
>
> I think unlike the --suppress-cc ones that are about changing semantics
> (and it does not matter "to a much saner one"), this is a fix that is more
> important for the upcoming release.  Splitting Cc list and folding headers
> also fall into the same category, I think.
>
> I'd prefer a rebased series to have fixes first and then enhancements.
>
> Thanks.

Nah, please disregard.  This applies cleanly to the series before 3/3
which I think should not be 1.6.2, so we are in good shape.

Thanks.