Merge branch 'maint'
* maint: git-send-email: avoid duplicate message-ids clone: correctly report http_fetch errors
This commit is contained in:
commit
bd8ff616c9
11
git-clone.sh
11
git-clone.sh
@ -56,11 +56,12 @@ fi
|
|||||||
|
|
||||||
http_fetch () {
|
http_fetch () {
|
||||||
# $1 = Remote, $2 = Local
|
# $1 = Remote, $2 = Local
|
||||||
curl -nsfL $curl_extra_args "$1" >"$2" ||
|
curl -nsfL $curl_extra_args "$1" >"$2"
|
||||||
case $? in
|
curl_exit_status=$?
|
||||||
126|127) exit ;;
|
case $curl_exit_status in
|
||||||
*) return $? ;;
|
126|127) exit ;;
|
||||||
esac
|
*) return $curl_exit_status ;;
|
||||||
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
clone_dumb_http () {
|
clone_dumb_http () {
|
||||||
|
@ -580,7 +580,7 @@ sub send_message
|
|||||||
$ccline = "\nCc: $cc";
|
$ccline = "\nCc: $cc";
|
||||||
}
|
}
|
||||||
my $sanitized_sender = sanitize_address($sender);
|
my $sanitized_sender = sanitize_address($sender);
|
||||||
make_message_id();
|
make_message_id() unless defined($message_id);
|
||||||
|
|
||||||
my $header = "From: $sanitized_sender
|
my $header = "From: $sanitized_sender
|
||||||
To: $to${ccline}
|
To: $to${ccline}
|
||||||
@ -718,6 +718,9 @@ foreach my $t (@files) {
|
|||||||
}
|
}
|
||||||
push @xh, $_;
|
push @xh, $_;
|
||||||
}
|
}
|
||||||
|
elsif (/^Message-Id: (.*)/i) {
|
||||||
|
$message_id = $1;
|
||||||
|
}
|
||||||
elsif (!/^Date:\s/ && /^[-A-Za-z]+:\s+\S/) {
|
elsif (!/^Date:\s/ && /^[-A-Za-z]+:\s+\S/) {
|
||||||
push @xh, $_;
|
push @xh, $_;
|
||||||
}
|
}
|
||||||
@ -805,6 +808,7 @@ foreach my $t (@files) {
|
|||||||
$references = "$message_id";
|
$references = "$message_id";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$message_id = undef;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($compose) {
|
if ($compose) {
|
||||||
|
Loading…
Reference in New Issue
Block a user