mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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
This commit is contained in:
Junio C Hamano 2010-11-24 13:24:49 -08:00
commit c6caede7fd
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1936,7 +1936,7 @@ git-%$X: %.o $(GITLIBS)
git-imap-send$X: imap-send.o $(GITLIBS) git-imap-send$X: imap-send.o $(GITLIBS)
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \ $(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) 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,$^) \ $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \

4
compat/mingw.c
View File

@ -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) static int do_lstat(int follow, const char *file_name, struct stat *buf)
{ {
int err;
WIN32_FILE_ATTRIBUTE_DATA fdata; 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_ino = 0;
buf->st_gid = 0; buf->st_gid = 0;
buf->st_uid = 0; buf->st_uid = 0;
@ -233,6 +234,7 @@ static int do_lstat(int follow, const char *file_name, struct stat *buf)
} }
return 0; return 0;
} }
errno = err;
return -1; return -1;
} }

2
git-send-email.perl
View File

@ -960,7 +960,7 @@ sub maildomain {
sub send_message { sub send_message {
my @recipients = unique_email_list(@to); my @recipients = unique_email_list(@to);
@cc = (grep { my $cc = extract_valid_address($_); @cc = (grep { my $cc = extract_valid_address($_);
not grep { $cc eq $_ } @recipients not grep { $cc eq $_ || $_ =~ /<\Q${cc}\E>$/ } @recipients
} }
map { sanitize_address($_) } map { sanitize_address($_) }
@cc); @cc);