From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Erik Faye-Lund <kusmabite@gmail.com>
Cc: git@vger.kernel.org, peff@peff.net, j6t@kdbg.org, gitster@pobox.com
Subject: Re: [PATCH v3 1/4] compat/win32/sys/poll.c: upgrade from upstream
Date: Fri, 30 Sep 2011 21:00:02 +0200 [thread overview]
Message-ID: <4E8611B2.8030907@lsrfire.ath.cx> (raw)
In-Reply-To: <1317329963-6656-2-git-send-email-kusmabite@gmail.com>
Am 29.09.2011 22:59, schrieb Erik Faye-Lund:
> poll.c is updated from revision adc3a5b in
> git://git.savannah.gnu.org/gnulib.git
>
> The changes are applied with --whitespace=fix to reduce noise.
>
> poll.h is not upgraded, because the most recent version now
> contains template-stuff that breaks compilation for us.
> @@ -27,7 +27,10 @@
> #include <malloc.h>
>
> #include <sys/types.h>
> -#include "poll.h"
> +
> +/* Specification. */
> +#include <poll.h>
> +
In order to make bisecting easier, I think it's a good idea to squash in
the next patch that undoes this part, i.e. simply skip this hunk and add
a third non-verbatim note to the commit message.
René
next prev parent reply other threads:[~2011-09-30 19:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-29 20:59 [PATCH v3 0/4] port upload-archive to Windows Erik Faye-Lund
2011-09-29 20:59 ` [PATCH v3 1/4] compat/win32/sys/poll.c: upgrade from upstream Erik Faye-Lund
2011-09-30 19:00 ` René Scharfe [this message]
2011-09-29 20:59 ` [PATCH v3 2/4] mingw: fix compilation of poll-emulation Erik Faye-Lund
2011-09-29 20:59 ` [PATCH v3 3/4] enter_repo: do not modify input Erik Faye-Lund
2011-09-30 19:00 ` René Scharfe
2011-10-04 17:55 ` Phil Hord
2011-10-04 18:00 ` Phil Hord
2011-10-06 13:06 ` Erik Faye-Lund
2011-09-29 20:59 ` [PATCH v3 4/4] upload-archive: use start_command instead of fork Erik Faye-Lund
2011-10-03 18:39 ` Junio C Hamano
2011-10-03 18:48 ` Erik Faye-Lund
2011-10-03 19:31 ` Junio C Hamano
2011-09-29 21:01 ` [PATCH v3 0/4] port upload-archive to Windows Erik Faye-Lund
2011-09-30 10:46 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4E8611B2.8030907@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=kusmabite@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).