undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-send-email: avoid duplicate message-ids
  clone: correctly report http_fetch errors
This commit is contained in:
Junio C Hamano 2007-12-17 20:49:42 -08:00
commit bd8ff616c9
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git-clone.sh
View File

@ -56,10 +56,11 @@ 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=$?
case $curl_exit_status in
126|127) exit ;; 126|127) exit ;;
*) return $? ;; *) return $curl_exit_status ;;
esac esac
} }

6
git-send-email.perl
View File

@ -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) {