Merge branch 'maint'

gitster · gitster · commit c6caede7fd6b · 2010-11-24T13:24:49.000-08:00
* maint:
  imap-send: link against libcrypto for HMAC and others
  git-send-email.perl: Deduplicate "to:" and "cc:" entries with names
  mingw: do not set errno to 0 on success
diff --git a/Makefile b/Makefile
@@ -1936,7 +1936,7 @@ git-%$X: %.o $(GITLIBS)
 
 git-imap-send$X: imap-send.o $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
-		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL)
+		$(LIBS) $(OPENSSL_LINK) $(OPENSSL_LIBSSL) $(LIB_4_CRYPTO)
 
 git-http-fetch$X: revision.o http.o http-walker.o http-fetch.o $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -198,9 +198,10 @@ static inline time_t filetime_to_time_t(const FILETIME *ft)
  */
 static int do_lstat(int follow, const char *file_name, struct stat *buf)
 {
+	int err;
 	WIN32_FILE_ATTRIBUTE_DATA fdata;
 
-	if (!(errno = get_file_attr(file_name, &fdata))) {
+	if (!(err = get_file_attr(file_name, &fdata))) {
 		buf->st_ino = 0;
 		buf->st_gid = 0;
 		buf->st_uid = 0;
@@ -233,6 +234,7 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
 		}
 		return 0;
 	}
+	errno = err;
 	return -1;
 }
 
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -960,7 +960,7 @@ sub maildomain {
 sub send_message {
 	my @recipients = unique_email_list(@to);
 	@cc = (grep { my $cc = extract_valid_address($_);
-		      not grep { $cc eq $_ } @recipients
+		      not grep { $cc eq $_ || $_ =~ /<\Q${cc}\E>$/ } @recipients
 		    }
 	       map { sanitize_address($_) }
 	       @cc);

Original file line number	Diff line number	Diff line change
`@@ -198,9 +198,10 @@ static inline time_t filetime_to_time_t(const FILETIME *ft)`
`198`	`198`	`*/`
`199`	`199`	`static int do_lstat(int follow, const char file_name, struct stat buf)`
`200`	`200`	`{`
	`201`	`+ int err;`
`201`	`202`	`WIN32_FILE_ATTRIBUTE_DATA fdata;`
`202`	`203`
`203`		`- if (!(errno = get_file_attr(file_name, &fdata))) {`
	`204`	`+ if (!(err = get_file_attr(file_name, &fdata))) {`
`204`	`205`	`buf->st_ino = 0;`
`205`	`206`	`buf->st_gid = 0;`
`206`	`207`	`buf->st_uid = 0;`
`@@ -233,6 +234,7 @@ static int do_lstat(int follow, const char file_name, struct stat buf)`
`233`	`234`	`}`
`234`	`235`	`return 0;`
`235`	`236`	`}`
	`237`	`+ errno = err;`
`236`	`238`	`return -1;`
`237`	`239`	`}`
`238`	`240`
Original file line number	Diff line number	Diff line change
`@@ -960,7 +960,7 @@ sub maildomain {`
`960`	`960`	`sub send_message {`
`961`	`961`	`my @recipients = unique_email_list(@to);`
`962`	`962`	`@cc = (grep { my $cc = extract_valid_address($_);`
`963`		`- not grep { $cc eq $_ } @recipients`
	`963`	`+ not grep { $cc eq $_ \|\| $_ =~ /<\Q${cc}\E>$/ } @recipients`
`964`	`964`	`}`
`965`	`965`	`map { sanitize_address($_) }`
`966`	`966`	`@cc);`