Re: [PATCH 08/12] MINGW: config.mak.uname allow using CURL for non-msysGit builds
On Mon, Apr 28, 2014 at 6:23 PM, Marat Radchenko wrote: > On Mon, Apr 28, 2014 at 05:26:38PM +0200, Erik Faye-Lund wrote: >> On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko >> wrote: >> > Also, fix `warning: passing argument 2 of 'mingw_main' from >> > incompatible pointer type` in http-fetch.c and remote-curl.c. >> >> These seems completely unrelated, perhaps it should be split in two? > > Okay, will split. Though there is a connection - until this patch, > http-fetch.c and remote-curl.c never built for MinGW. Ahh, thanks for pointing that out. But yeah, I think splitting is still the right option. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 08/12] MINGW: config.mak.uname allow using CURL for non-msysGit builds
On Mon, Apr 28, 2014 at 05:26:38PM +0200, Erik Faye-Lund wrote: > On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko > wrote: > > Also, fix `warning: passing argument 2 of 'mingw_main' from > > incompatible pointer type` in http-fetch.c and remote-curl.c. > > These seems completely unrelated, perhaps it should be split in two? Okay, will split. Though there is a connection - until this patch, http-fetch.c and remote-curl.c never built for MinGW. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 08/12] MINGW: config.mak.uname allow using CURL for non-msysGit builds
On Mon, Apr 28, 2014 at 3:51 PM, Marat Radchenko wrote: > Also, fix `warning: passing argument 2 of 'mingw_main' from > incompatible pointer type` in http-fetch.c and remote-curl.c. These seems completely unrelated, perhaps it should be split in two? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 08/12] MINGW: config.mak.uname allow using CURL for non-msysGit builds
Also, fix `warning: passing argument 2 of 'mingw_main' from
incompatible pointer type` in http-fetch.c and remote-curl.c.
Signed-off-by: Marat Radchenko
---
config.mak.uname | 2 --
http-fetch.c | 5 +++--
remote-curl.c| 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/config.mak.uname b/config.mak.uname
index 2f1939e..a376b32 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -523,8 +523,6 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
EXTLIBS += /mingw/lib/libz.a
INTERNAL_QSORT = YesPlease
NO_GETTEXT = YesPlease
-else
- NO_CURL = YesPlease
endif
HAVE_LIBCHARSET_H = YesPlease
NO_R_TO_GCC_LINKER = YesPlease
diff --git a/http-fetch.c b/http-fetch.c
index ba3ea10..a6a9a2f 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -6,7 +6,7 @@
static const char http_fetch_usage[] = "git http-fetch "
"[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url";
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
{
struct walker *walker;
int commits_on_stdin = 0;
@@ -38,7 +38,8 @@ int main(int argc, const char **argv)
} else if (argv[arg][1] == 'v') {
get_verbosely = 1;
} else if (argv[arg][1] == 'w') {
- write_ref = &argv[arg + 1];
+ const char *ref = argv[arg + 1];
+ write_ref = &ref;
arg++;
} else if (argv[arg][1] == 'h') {
usage(http_fetch_usage);
diff --git a/remote-curl.c b/remote-curl.c
index 52c2d96..565b6c9 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -938,7 +938,7 @@ static void parse_push(struct strbuf *buf)
free(specs);
}
-int main(int argc, const char **argv)
+int main(int argc, char **argv)
{
struct strbuf buf = STRBUF_INIT;
int nongit;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
